From 2aed070a00f5360ea2ce00b10b2405c4b3d36e1f Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Thu, 25 Jan 2024 12:13:04 +0100 Subject: [PATCH] fix: use the latest configbump image (#1803) Signed-off-by: Anatolii Bazko --- build/scripts/release/make-release.sh | 10 +++++++--- .../manifests/che-operator.clusterserviceversion.yaml | 6 +++--- config/manager/manager.yaml | 2 +- deploy/deployment/kubernetes/combined.yaml | 2 +- .../kubernetes/objects/che-operator.Deployment.yaml | 2 +- deploy/deployment/openshift/combined.yaml | 2 +- .../openshift/objects/che-operator.Deployment.yaml | 2 +- helmcharts/next/templates/che-operator.Deployment.yaml | 2 +- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/build/scripts/release/make-release.sh b/build/scripts/release/make-release.sh index e0c577932..df969df04 100755 --- a/build/scripts/release/make-release.sh +++ b/build/scripts/release/make-release.sh @@ -105,7 +105,7 @@ checkImageReferences() { echo "[ERROR] Unable to find Che server image with version ${RELEASE} in the $filename"; exit 1 fi -if ! grep -q "value: quay.io/eclipse/che-dashboard:$RELEASE" $filename; then + if ! grep -q "value: quay.io/eclipse/che-dashboard:$RELEASE" $filename; then echo "[ERROR] Unable to find dashboard image with version ${RELEASE} in the $filename"; exit 1 fi @@ -117,8 +117,8 @@ if ! grep -q "value: quay.io/eclipse/che-dashboard:$RELEASE" $filename; then echo "[ERROR] Unable to find devfile registry image with version ${RELEASE} in the $filename"; exit 1 fi - if ! grep -q "value: $RELATED_IMAGE_pvc_jobs" $filename; then - echo "[ERROR] Unable to find ubi8_minimal image in the $filename"; exit 1 + if ! grep -q "value: quay.io/che-incubator/configbump:$RELEASE" $filename; then + echo "[ERROR] Unable to find configbump image with version ${RELEASE} in the $filename"; exit 1 fi } @@ -150,11 +150,14 @@ replaceImagesTags() { lastDefaultDashboardImage=$(yq -r ".spec.template.spec.containers[] | select(.name == \"che-operator\") | .env[] | select(.name == \"RELATED_IMAGE_dashboard\") | .value" "${OPERATOR_YAML}") lastDefaultPluginRegistryImage=$(yq -r ".spec.template.spec.containers[] | select(.name == \"che-operator\") | .env[] | select(.name == \"RELATED_IMAGE_plugin_registry\") | .value" "${OPERATOR_YAML}") lastDefaultDevfileRegistryImage=$(yq -r ".spec.template.spec.containers[] | select(.name == \"che-operator\") | .env[] | select(.name == \"RELATED_IMAGE_devfile_registry\") | .value" "${OPERATOR_YAML}") + lastDefaultGatewayConfigImage=$(yq -r ".spec.template.spec.containers[] | select(.name == \"che-operator\") | .env[] | select(.name == \"RELATED_IMAGE_single_host_gateway_config_sidecar\") | .value" "${OPERATOR_YAML}") + CHE_SERVER_IMAGE_REALEASE=$(replaceTag "${lastDefaultCheServerImage}" "${RELEASE}") DASHBOARD_IMAGE_REALEASE=$(replaceTag "${lastDefaultDashboardImage}" "${RELEASE}") PLUGIN_REGISTRY_IMAGE_RELEASE=$(replaceTag "${lastDefaultPluginRegistryImage}" "${RELEASE}") DEVFILE_REGISTRY_IMAGE_RELEASE=$(replaceTag "${lastDefaultDevfileRegistryImage}" "${RELEASE}") + GATEWAY_CONFIG_IMAGE_RELEASE=$(replaceTag "${lastDefaultGatewayConfigImage}" "${RELEASE}") NEW_OPERATOR_YAML="${OPERATOR_YAML}.new" # copy licence header @@ -167,6 +170,7 @@ replaceImagesTags() { yq -ryY "( .spec.template.spec.containers[] | select(.name == \"che-operator\").env[] | select(.name == \"RELATED_IMAGE_dashboard\") | .value ) = \"${DASHBOARD_IMAGE_REALEASE}\"" | \ yq -ryY "( .spec.template.spec.containers[] | select(.name == \"che-operator\").env[] | select(.name == \"RELATED_IMAGE_plugin_registry\") | .value ) = \"${PLUGIN_REGISTRY_IMAGE_RELEASE}\"" | \ yq -ryY "( .spec.template.spec.containers[] | select(.name == \"che-operator\").env[] | select(.name == \"RELATED_IMAGE_devfile_registry\") | .value ) = \"${DEVFILE_REGISTRY_IMAGE_RELEASE}\"" \ + yq -ryY "( .spec.template.spec.containers[] | select(.name == \"che-operator\").env[] | select(.name == \"RELATED_IMAGE_single_host_gateway_config_sidecar\") | .value ) = \"${GATEWAY_CONFIG_IMAGE_RELEASE}\"" \ >> "${NEW_OPERATOR_YAML}" mv "${NEW_OPERATOR_YAML}" "${OPERATOR_YAML}" } diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml index a7606ed1a..fcbb1a088 100644 --- a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml @@ -77,7 +77,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.v7.81.0-830.next + name: eclipse-che.v7.81.0-831.next namespace: placeholder spec: apiservicedefinitions: {} @@ -925,7 +925,7 @@ spec: - name: RELATED_IMAGE_single_host_gateway value: quay.io/eclipse/che--traefik:v2.9.10-8d81a9df1435f9f3d36ac9398465ef2d5d61e671059974db753faaed14b627de - name: RELATED_IMAGE_single_host_gateway_config_sidecar - value: quay.io/che-incubator/configbump:0.1.4 + value: quay.io/che-incubator/configbump:next - name: RELATED_IMAGE_gateway_authentication_sidecar value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar @@ -1240,7 +1240,7 @@ spec: minKubeVersion: 1.19.0 provider: name: Eclipse Foundation - version: 7.81.0-830.next + version: 7.81.0-831.next webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 5f7f270e8..24417355a 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -74,7 +74,7 @@ spec: - name: RELATED_IMAGE_single_host_gateway value: quay.io/eclipse/che--traefik:v2.9.10-8d81a9df1435f9f3d36ac9398465ef2d5d61e671059974db753faaed14b627de - name: RELATED_IMAGE_single_host_gateway_config_sidecar - value: quay.io/che-incubator/configbump:0.1.4 + value: quay.io/che-incubator/configbump:next - name: RELATED_IMAGE_gateway_authentication_sidecar value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index a4c3b5959..c4b089b4f 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -8943,7 +8943,7 @@ spec: - name: RELATED_IMAGE_single_host_gateway value: quay.io/eclipse/che--traefik:v2.9.10-8d81a9df1435f9f3d36ac9398465ef2d5d61e671059974db753faaed14b627de - name: RELATED_IMAGE_single_host_gateway_config_sidecar - value: quay.io/che-incubator/configbump:0.1.4 + value: quay.io/che-incubator/configbump:next - name: RELATED_IMAGE_gateway_authentication_sidecar value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar diff --git a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml index 194e6ee77..a278df298 100644 --- a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml +++ b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml @@ -68,7 +68,7 @@ spec: - name: RELATED_IMAGE_single_host_gateway value: quay.io/eclipse/che--traefik:v2.9.10-8d81a9df1435f9f3d36ac9398465ef2d5d61e671059974db753faaed14b627de - name: RELATED_IMAGE_single_host_gateway_config_sidecar - value: quay.io/che-incubator/configbump:0.1.4 + value: quay.io/che-incubator/configbump:next - name: RELATED_IMAGE_gateway_authentication_sidecar value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 3e448dfd9..94a4284cc 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -8945,7 +8945,7 @@ spec: - name: RELATED_IMAGE_single_host_gateway value: quay.io/eclipse/che--traefik:v2.9.10-8d81a9df1435f9f3d36ac9398465ef2d5d61e671059974db753faaed14b627de - name: RELATED_IMAGE_single_host_gateway_config_sidecar - value: quay.io/che-incubator/configbump:0.1.4 + value: quay.io/che-incubator/configbump:next - name: RELATED_IMAGE_gateway_authentication_sidecar value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar diff --git a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml index 0dcad70c7..1237b99fd 100644 --- a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml +++ b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml @@ -68,7 +68,7 @@ spec: - name: RELATED_IMAGE_single_host_gateway value: quay.io/eclipse/che--traefik:v2.9.10-8d81a9df1435f9f3d36ac9398465ef2d5d61e671059974db753faaed14b627de - name: RELATED_IMAGE_single_host_gateway_config_sidecar - value: quay.io/che-incubator/configbump:0.1.4 + value: quay.io/che-incubator/configbump:next - name: RELATED_IMAGE_gateway_authentication_sidecar value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar diff --git a/helmcharts/next/templates/che-operator.Deployment.yaml b/helmcharts/next/templates/che-operator.Deployment.yaml index 194e6ee77..a278df298 100644 --- a/helmcharts/next/templates/che-operator.Deployment.yaml +++ b/helmcharts/next/templates/che-operator.Deployment.yaml @@ -68,7 +68,7 @@ spec: - name: RELATED_IMAGE_single_host_gateway value: quay.io/eclipse/che--traefik:v2.9.10-8d81a9df1435f9f3d36ac9398465ef2d5d61e671059974db753faaed14b627de - name: RELATED_IMAGE_single_host_gateway_config_sidecar - value: quay.io/che-incubator/configbump:0.1.4 + value: quay.io/che-incubator/configbump:next - name: RELATED_IMAGE_gateway_authentication_sidecar value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar