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

Merge pull request #299 from eclipse/fixopenshiftdeployment713 

Do not read env var specific to k8s infra
7.13.x
Anatolii Bazko 2020-06-02 16:06:07 +03:00 committed by GitHub
parent 9a0004ee20 937c82ac92
commit b6d2666ee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/deploy/defaults.go
View File

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

3
pkg/util/util.go
View File

@ -34,7 +34,8 @@ import (
)
var (
k8sclient = GetK8Client()
k8sclient = GetK8Client()
IsOpenShift, IsOpenShift4, _ = DetectOpenShift()
)
func ContainsString(slice []string, s string) bool {