From 5d582d135c273b4c6e96f798bd3cfd2dc7239280 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Wed, 5 Apr 2023 15:14:05 +0300 Subject: [PATCH] fix: For update of existing installations we should not change the value of disableBuildCapabilities (#1654) Signed-off-by: Anatolii Bazko --- .../migration/checluster-defaults-cleaner_test.go | 2 +- .../migration/checluster-defaults-cleanupfunc.go | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkg/deploy/migration/checluster-defaults-cleaner_test.go b/pkg/deploy/migration/checluster-defaults-cleaner_test.go index 18f3c1604..0471ccd54 100644 --- a/pkg/deploy/migration/checluster-defaults-cleaner_test.go +++ b/pkg/deploy/migration/checluster-defaults-cleaner_test.go @@ -519,7 +519,7 @@ func TestCheClusterDefaultsCleanerDisableContainerBuildCapabilities(t *testing.T }, }, }, - expectedDisableContainerBuildCapabilities: nil, + expectedDisableContainerBuildCapabilities: pointer.BoolPtr(true), }, { name: "OpenShift case #3", diff --git a/pkg/deploy/migration/checluster-defaults-cleanupfunc.go b/pkg/deploy/migration/checluster-defaults-cleanupfunc.go index 7fc0c29e5..8193db01b 100644 --- a/pkg/deploy/migration/checluster-defaults-cleanupfunc.go +++ b/pkg/deploy/migration/checluster-defaults-cleanupfunc.go @@ -15,6 +15,7 @@ package migration import ( "encoding/json" "fmt" + "strconv" "github.com/devfile/devworkspace-operator/pkg/infrastructure" defaults "github.com/eclipse-che/che-operator/pkg/common/operator-defaults" @@ -157,8 +158,14 @@ func cleanUpDevEnvironmentsDisableContainerBuildCapabilities(ctx *chetypes.Deplo } if ctx.CheCluster.Spec.DevEnvironments.DisableContainerBuildCapabilities != nil { - ctx.CheCluster.Spec.DevEnvironments.DisableContainerBuildCapabilities = nil - return true, nil + disableContainerBuildCapabilities, err := strconv.ParseBool(defaults.GetDevEnvironmentsDisableContainerBuildCapabilities()) + if err != nil { + return false, err + } + if disableContainerBuildCapabilities == *ctx.CheCluster.Spec.DevEnvironments.DisableContainerBuildCapabilities { + ctx.CheCluster.Spec.DevEnvironments.DisableContainerBuildCapabilities = nil + return true, nil + } } return false, nil