seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: For update of existing installations we should not change the value of disableBuildCapabilities (#1654) 

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/1658/head
Anatolii Bazko 2023-04-05 15:14:05 +03:00 committed by GitHub
parent 55720a69b6
commit 5d582d135c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/deploy/migration/checluster-defaults-cleaner_test.go
View File

@ -519,7 +519,7 @@ func TestCheClusterDefaultsCleanerDisableContainerBuildCapabilities(t *testing.T
},
},
},
expectedDisableContainerBuildCapabilities: nil,
expectedDisableContainerBuildCapabilities: pointer.BoolPtr(true),
},
{
name: "OpenShift case #3",

11
pkg/deploy/migration/checluster-defaults-cleanupfunc.go
View File

@ -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