From 937c82ac92d3acf17904dba1c1aee1110b475d5e Mon Sep 17 00:00:00 2001 From: Anatoliy Bazko Date: Tue, 2 Jun 2020 15:15:42 +0300 Subject: [PATCH] Do not read env var specific to k8s infra Signed-off-by: Anatoliy Bazko --- pkg/deploy/defaults.go | 12 ++++++++++-- pkg/util/util.go | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/deploy/defaults.go b/pkg/deploy/defaults.go index b498e29f9..ef3981956 100644 --- a/pkg/deploy/defaults.go +++ b/pkg/deploy/defaults.go @@ -101,7 +101,6 @@ func InitDefaultsFromEnv() { defaultCheServerImage = getDefaultFromEnv("IMAGE_default_che_server") defaultPluginRegistryImage = getDefaultFromEnv("IMAGE_default_plugin_registry") defaultDevfileRegistryImage = getDefaultFromEnv("IMAGE_default_devfile_registry") - defaultCheTLSSecretsCreationJobImage = getDefaultFromEnv("IMAGE_default_che_tls_secrets_creation_job") defaultPvcJobsImage = getDefaultFromEnv("IMAGE_default_pvc_jobs") defaultPostgresImage = getDefaultFromEnv("IMAGE_default_postgres") defaultKeycloakImage = getDefaultFromEnv("IMAGE_default_keycloak") @@ -112,6 +111,11 @@ func InitDefaultsFromEnv() { defaultCheWorkspacePluginBrokerMetadataImage = getDefaultFromEnv("IMAGE_default_che_workspace_plugin_broker_metadata") defaultCheWorkspacePluginBrokerArtifactsImage = getDefaultFromEnv("IMAGE_default_che_workspace_plugin_broker_artifacts") defaultCheServerSecureExposerJwtProxyImage = getDefaultFromEnv("IMAGE_default_che_server_secure_exposer_jwt_proxy_image") + + // Don't get some k8s specific env + if !util.IsOpenShift { + defaultCheTLSSecretsCreationJobImage = getDefaultFromEnv("IMAGE_default_che_tls_secrets_creation_job") + } } func InitDefaultsFromFile(defaultsPath string) { @@ -121,13 +125,17 @@ func InitDefaultsFromFile(defaultsPath string) { defaultCheServerImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_che_server") defaultPluginRegistryImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_plugin_registry") defaultDevfileRegistryImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_devfile_registry") - defaultCheTLSSecretsCreationJobImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_che_tls_secrets_creation_job") defaultPvcJobsImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_pvc_jobs") defaultPostgresImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_postgres") defaultKeycloakImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_keycloak") defaultCheWorkspacePluginBrokerMetadataImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_che_workspace_plugin_broker_metadata") defaultCheWorkspacePluginBrokerArtifactsImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_che_workspace_plugin_broker_artifacts") defaultCheServerSecureExposerJwtProxyImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_che_server_secure_exposer_jwt_proxy_image") + + // Don't get some k8s specific env + if !util.IsOpenShift { + defaultCheTLSSecretsCreationJobImage = util.GetDeploymentEnv(operatorDeployment, "IMAGE_default_che_tls_secrets_creation_job") + } } func getDefaultsFromFile(defaultsPath string) *v1.Deployment { diff --git a/pkg/util/util.go b/pkg/util/util.go index af80f89e1..1b2e43fb8 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -34,7 +34,8 @@ import ( ) var ( - k8sclient = GetK8Client() + k8sclient = GetK8Client() + IsOpenShift, IsOpenShift4, _ = DetectOpenShift() ) func ContainsString(slice []string, s string) bool {