From edca3de035935917292cef5b0dccb3db6a75eef8 Mon Sep 17 00:00:00 2001 From: Michal Vala Date: Fri, 20 Aug 2021 12:49:57 +0200 Subject: [PATCH] feat: update traefik to 2.5.0 (#1023) Signed-off-by: Michal Vala --- .../che-operator.clusterserviceversion.yaml | 6 +-- .../che-operator.clusterserviceversion.yaml | 6 +-- config/manager/manager.yaml | 2 +- controllers/devworkspace/defaults/defaults.go | 2 +- pkg/deploy/defaults.go | 45 +++++++------------ 5 files changed, 25 insertions(+), 36 deletions(-) diff --git a/bundle/next/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml index 90f174bd2..fdcd79d01 100644 --- a/bundle/next/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml @@ -83,7 +83,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/eclipse-che/che-operator support: Eclipse Foundation - name: eclipse-che-preview-kubernetes.v7.35.0-281.next + name: eclipse-che-preview-kubernetes.v7.36.0-286.next namespace: placeholder spec: apiservicedefinitions: {} @@ -884,7 +884,7 @@ spec: - name: RELATED_IMAGE_che_server_secure_exposer_jwt_proxy_image value: quay.io/eclipse/che-jwtproxy:0.10.0 - name: RELATED_IMAGE_single_host_gateway - value: quay.io/eclipse/che--traefik:v2.3.2-6e6d4dc5a19afe06778ca092cdbbb98e31cb9f9c313edafa23f81a0e6ddf8a23 + value: quay.io/eclipse/che--traefik:v2.5.0-eb30f9f09a65cee1fab5ef9c64cb4ec91b800dc3fdd738d62a9d4334f0114683 - name: RELATED_IMAGE_single_host_gateway_native_user_mode value: quay.io/eclipse/che--traefik:v2.5.0-rc2-df90799aaca1ad6fb9e06d311140035d2a0c2295a4f8f508f6b55ee056bb677e - name: RELATED_IMAGE_single_host_gateway_config_sidecar @@ -1176,4 +1176,4 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.35.0-281.next + version: 7.36.0-286.next diff --git a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml index 5b19f86c1..49dd12281 100644 --- a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml @@ -76,7 +76,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/eclipse-che/che-operator support: Eclipse Foundation - name: eclipse-che-preview-openshift.v7.35.0-281.next + name: eclipse-che-preview-openshift.v7.36.0-286.next namespace: placeholder spec: apiservicedefinitions: {} @@ -931,7 +931,7 @@ spec: - name: RELATED_IMAGE_che_server_secure_exposer_jwt_proxy_image value: quay.io/eclipse/che-jwtproxy:0.10.0 - name: RELATED_IMAGE_single_host_gateway - value: quay.io/eclipse/che--traefik:v2.3.2-6e6d4dc5a19afe06778ca092cdbbb98e31cb9f9c313edafa23f81a0e6ddf8a23 + value: quay.io/eclipse/che--traefik:v2.5.0-eb30f9f09a65cee1fab5ef9c64cb4ec91b800dc3fdd738d62a9d4334f0114683 - name: RELATED_IMAGE_single_host_gateway_native_user_mode value: quay.io/eclipse/che--traefik:v2.5.0-rc2-df90799aaca1ad6fb9e06d311140035d2a0c2295a4f8f508f6b55ee056bb677e - name: RELATED_IMAGE_single_host_gateway_config_sidecar @@ -1245,4 +1245,4 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.35.0-281.next + version: 7.36.0-286.next diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 0aa6665a5..64d07e433 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -80,7 +80,7 @@ spec: - name: RELATED_IMAGE_che_server_secure_exposer_jwt_proxy_image value: quay.io/eclipse/che-jwtproxy:0.10.0 - name: RELATED_IMAGE_single_host_gateway - value: quay.io/eclipse/che--traefik:v2.3.2-6e6d4dc5a19afe06778ca092cdbbb98e31cb9f9c313edafa23f81a0e6ddf8a23 + value: quay.io/eclipse/che--traefik:v2.5.0-eb30f9f09a65cee1fab5ef9c64cb4ec91b800dc3fdd738d62a9d4334f0114683 - name: RELATED_IMAGE_single_host_gateway_native_user_mode value: quay.io/eclipse/che--traefik:v2.5.0-rc2-df90799aaca1ad6fb9e06d311140035d2a0c2295a4f8f508f6b55ee056bb677e - name: RELATED_IMAGE_single_host_gateway_config_sidecar diff --git a/controllers/devworkspace/defaults/defaults.go b/controllers/devworkspace/defaults/defaults.go index a2a473dc0..9b778ad16 100644 --- a/controllers/devworkspace/defaults/defaults.go +++ b/controllers/devworkspace/defaults/defaults.go @@ -12,7 +12,7 @@ const ( gatewayImageEnvVarName = "RELATED_IMAGE_gateway" gatewayConfigurerImageEnvVarName = "RELATED_IMAGE_gateway_configurer" - defaultGatewayImage = "quay.io/eclipse/che--traefik:v2.3.2-6e6d4dc5a19afe06778ca092cdbbb98e31cb9f9c313edafa23f81a0e6ddf8a23" + defaultGatewayImage = "quay.io/eclipse/che--traefik:v2.5.0-eb30f9f09a65cee1fab5ef9c64cb4ec91b800dc3fdd738d62a9d4334f0114683" defaultGatewayConfigurerImage = "quay.io/che-incubator/configbump:0.1.4" configAnnotationPrefix = "che.routing.controller.devfile.io/" diff --git a/pkg/deploy/defaults.go b/pkg/deploy/defaults.go index c38edbc33..f4972bece 100644 --- a/pkg/deploy/defaults.go +++ b/pkg/deploy/defaults.go @@ -27,23 +27,22 @@ import ( ) var ( - defaultCheServerImage string - defaultCheVersion string - defaultDashboardImage string - defaultDevworkspaceControllerImage string - defaultPluginRegistryImage string - defaultDevfileRegistryImage string - defaultCheTLSSecretsCreationJobImage string - defaultPvcJobsImage string - defaultPostgresImage string - defaultKeycloakImage string - defaultSingleHostGatewayImage string - defaultSingleHostGatewayImageNativeUserMode string - defaultSingleHostGatewayConfigSidecarImage string - defaultInternalRestBackupServerImage string - defaultGatewayAuthenticationSidecarImage string - defaultGatewayAuthorizationSidecarImage string - defaultGatewayHeaderProxySidecarImage string + defaultCheServerImage string + defaultCheVersion string + defaultDashboardImage string + defaultDevworkspaceControllerImage string + defaultPluginRegistryImage string + defaultDevfileRegistryImage string + defaultCheTLSSecretsCreationJobImage string + defaultPvcJobsImage string + defaultPostgresImage string + defaultKeycloakImage string + defaultSingleHostGatewayImage string + defaultSingleHostGatewayConfigSidecarImage string + defaultInternalRestBackupServerImage string + defaultGatewayAuthenticationSidecarImage string + defaultGatewayAuthorizationSidecarImage string + defaultGatewayHeaderProxySidecarImage string defaultCheWorkspacePluginBrokerMetadataImage string defaultCheWorkspacePluginBrokerArtifactsImage string @@ -182,7 +181,6 @@ func InitDefaultsFromFile(defaultsPath string) { defaultPostgresImage = util.GetDeploymentEnv(operatorDeployment, util.GetArchitectureDependentEnv("RELATED_IMAGE_postgres")) defaultKeycloakImage = util.GetDeploymentEnv(operatorDeployment, util.GetArchitectureDependentEnv("RELATED_IMAGE_keycloak")) defaultSingleHostGatewayImage = util.GetDeploymentEnv(operatorDeployment, util.GetArchitectureDependentEnv("RELATED_IMAGE_single_host_gateway")) - defaultSingleHostGatewayImageNativeUserMode = util.GetDeploymentEnv(operatorDeployment, util.GetArchitectureDependentEnv("RELATED_IMAGE_single_host_gateway_native_user_mode")) defaultSingleHostGatewayConfigSidecarImage = util.GetDeploymentEnv(operatorDeployment, util.GetArchitectureDependentEnv("RELATED_IMAGE_single_host_gateway_config_sidecar")) defaultGatewayAuthenticationSidecarImage = util.GetDeploymentEnv(operatorDeployment, util.GetArchitectureDependentEnv("RELATED_IMAGE_gateway_authentication_sidecar")) defaultGatewayAuthorizationSidecarImage = util.GetDeploymentEnv(operatorDeployment, util.GetArchitectureDependentEnv("RELATED_IMAGE_gateway_authorization_sidecar")) @@ -325,15 +323,7 @@ func DefaultCheServerSecureExposerJwtProxyImage(cr *orgv1.CheCluster) string { } func DefaultSingleHostGatewayImage(cr *orgv1.CheCluster) string { - // `nativeUserMode` uses Traefik local plugins, which is supported from version 2.5 that is - // currently in Release Candidate. As we don't want to use RC version in our stable release, - // we're using 2 images now. As soon as Traefik 2.5 stable will be releases, we will remove - // `defaultSingleHostGatewayImageNativeUserMode` and use single image again. - if util.IsNativeUserModeEnabled(cr) { - return patchDefaultImageName(cr, defaultSingleHostGatewayImageNativeUserMode) - } else { - return patchDefaultImageName(cr, defaultSingleHostGatewayImage) - } + return patchDefaultImageName(cr, defaultSingleHostGatewayImage) } func DefaultSingleHostGatewayConfigSidecarImage(cr *orgv1.CheCluster) string { @@ -458,7 +448,6 @@ func InitDefaultsFromEnv() { defaultPostgresImage = getDefaultFromEnv(util.GetArchitectureDependentEnv("RELATED_IMAGE_postgres")) defaultKeycloakImage = getDefaultFromEnv(util.GetArchitectureDependentEnv("RELATED_IMAGE_keycloak")) defaultSingleHostGatewayImage = getDefaultFromEnv(util.GetArchitectureDependentEnv("RELATED_IMAGE_single_host_gateway")) - defaultSingleHostGatewayImageNativeUserMode = getDefaultFromEnv(util.GetArchitectureDependentEnv("RELATED_IMAGE_single_host_gateway_native_user_mode")) defaultSingleHostGatewayConfigSidecarImage = getDefaultFromEnv(util.GetArchitectureDependentEnv("RELATED_IMAGE_single_host_gateway_config_sidecar")) defaultInternalRestBackupServerImage = getDefaultFromEnv(util.GetArchitectureDependentEnv("RELATED_IMAGE_internal_rest_backup_server")) defaultGatewayAuthenticationSidecarImage = getDefaultFromEnv(util.GetArchitectureDependentEnv("RELATED_IMAGE_gateway_authentication_sidecar"))