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 issue #32 by providing distinct defaults (#35) 

Signed-off-by: David Festal <dfestal@redhat.com>
pull/37/head
David Festal 2019-06-18 19:18:29 +02:00 committed by GitHub
parent fdd0f43d29
commit 03d99e263e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/che/create.go
View File

@ -509,7 +509,11 @@ func (r *ReconcileChe) GenerateAndSaveFields(instance *orgv1.CheCluster, request
return err
}
}
pvcJobsImage := util.GetValue(instance.Spec.Storage.PvcJobsImage, deploy.DefaultPvcJobsImage)
defaultPVCJobsImage := deploy.DefaultPvcJobsUpstreamImage
if cheFlavor == "codeready" {
defaultPVCJobsImage = deploy.DefaultPvcJobsImage
}
pvcJobsImage := util.GetValue(instance.Spec.Storage.PvcJobsImage, defaultPVCJobsImage)
if len(instance.Spec.Storage.PvcJobsImage) < 1 {
instance.Spec.Storage.PvcJobsImage = pvcJobsImage
if err := r.UpdateCheCRSpec(instance, "pvc jobs image", pvcJobsImage); err != nil {

7
pkg/deploy/che_configmap.go
View File

@ -136,7 +136,12 @@ func GetConfigMapData(cr *orgv1.CheCluster) (cheEnv map[string]string) {
pvcStrategy := util.GetValue(cr.Spec.Storage.PvcStrategy, DefaultPvcStrategy)
pvcClaimSize := util.GetValue(cr.Spec.Storage.PvcClaimSize, DefaultPvcClaimSize)
workspacePvcStorageClassName := cr.Spec.Storage.WorkspacePVCStorageClassName
pvcJobsImage := util.GetValue(cr.Spec.Storage.PvcJobsImage, DefaultPvcJobsImage)
defaultPVCJobsImage := DefaultPvcJobsUpstreamImage
if cheFlavor == "codeready" {
defaultPVCJobsImage = DefaultPvcJobsImage
}
pvcJobsImage := util.GetValue(cr.Spec.Storage.PvcJobsImage, defaultPVCJobsImage)
preCreateSubPaths := "true"
if !cr.Spec.Storage.PreCreateSubPaths {
preCreateSubPaths = "false"

1
pkg/deploy/defaults.go
View File

@ -32,6 +32,7 @@ const (
DefaultCheLogLevel = "INFO"
DefaultCheDebug = "false"
DefaultPvcJobsImage = "registry.redhat.io/ubi8-minimal:8.0-127"
DefaultPvcJobsUpstreamImage = "registry.access.redhat.com/ubi8-minimal:8.0-127"
DefaultPostgresImage = "registry.redhat.io/rhscl/postgresql-96-rhel7:1-40"
DefaultPostgresUpstreamImage = "centos/postgresql-96-centos7:9.6"
DefaultKeycloakImage = "registry.redhat.io/redhat-sso-7/sso73-openshift:1.0-11"