From c9f2dde7a80351f544be5f3c2e10951f78cd41ca Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Fri, 18 Mar 2022 18:22:25 +0200 Subject: [PATCH] fix: Clean up removing plugin brokers images (#1350) Signed-off-by: Anatolii Bazko --- make-release.sh | 18 ------------------ pkg/deploy/image-puller/imagepuller.go | 1 - 2 files changed, 19 deletions(-) diff --git a/make-release.sh b/make-release.sh index b4fe5fadd..b49e81dcb 100755 --- a/make-release.sh +++ b/make-release.sh @@ -122,24 +122,6 @@ if ! grep -q "value: quay.io/eclipse/che-dashboard:$RELEASE" $filename; then if ! grep -q "value: $RELATED_IMAGE_pvc_jobs" $filename; then echo "[ERROR] Unable to find ubi8_minimal image in the $filename"; exit 1 fi - - # use ${RELEASE} instead of master - wget https://raw.githubusercontent.com/eclipse-che/che-server/${RELEASE}/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties -q -O /tmp/che.properties - - plugin_broker_meta_image=$(cat /tmp/che.properties | grep che.workspace.plugin_broker.metadata.image | cut -d '=' -f2) - if ! grep -q "value: $plugin_broker_meta_image" $filename; then - echo "[ERROR] Unable to find plugin broker meta image '$plugin_broker_meta_image' in the $filename"; exit 1 - fi - - plugin_broker_artifacts_image=$(cat /tmp/che.properties | grep che.workspace.plugin_broker.artifacts.image | cut -d '=' -f2) - if ! grep -q "value: $plugin_broker_artifacts_image" $filename; then - echo "[ERROR] Unable to find plugin broker artifacts image '$plugin_broker_artifacts_image' in the $filename"; exit 1 - fi - - jwt_proxy_image=$(cat /tmp/che.properties | grep che.server.secure_exposer.jwtproxy.image | cut -d '=' -f2) - if ! grep -q "value: $jwt_proxy_image" $filename; then - echo "[ERROR] Unable to find jwt proxy image $jwt_proxy_image in the $filename"; exit 1 - fi } releaseOperatorCode() { diff --git a/pkg/deploy/image-puller/imagepuller.go b/pkg/deploy/image-puller/imagepuller.go index 3b1ffa700..65e22481e 100644 --- a/pkg/deploy/image-puller/imagepuller.go +++ b/pkg/deploy/image-puller/imagepuller.go @@ -471,7 +471,6 @@ func StringToImageSlice(imagesString string) []ImageAndName { func GetDefaultImages() []ImageAndName { images := []ImageAndName{} imagePatterns := [...]string{ - "^RELATED_IMAGE_.*_plugin_broker.*", "^RELATED_IMAGE_.*_theia.*", "^RELATED_IMAGE_.*_machine(_)?exec(_.*)?_plugin_registry_image.*", "^RELATED_IMAGE_.*_kubernetes(_.*)?_plugin_registry_image.*",