From 2d52e03ea670938c40e487119174d08e388df360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Wed, 16 Oct 2024 09:26:27 +0200 Subject: [PATCH] feat(clowder): allow dual-use of image from registry_img and image --- deploy/clowdapp.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deploy/clowdapp.yaml b/deploy/clowdapp.yaml index 661d55937..8b475137f 100644 --- a/deploy/clowdapp.yaml +++ b/deploy/clowdapp.yaml @@ -54,7 +54,7 @@ objects: schedule: ${IMPORT_SSG_SCHEDULE} concurrencyPolicy: Forbid podSpec: - image: ${IMAGE}:${IMAGE_TAG} + image: "${DEPLOY}" initContainers: - command: ["/bin/sh"] args: ["-c", "$HOME/scripts/abort_if_pending_migrations.sh"] @@ -139,7 +139,7 @@ objects: enabled: true apiPath: compliance podSpec: - image: ${IMAGE}:${IMAGE_TAG} + image: ${DEPLOY} initContainers: - command: ["/bin/sh"] args: ["-c", "$HOME/scripts/check_migration_status_and_ssg_synced.sh"] @@ -495,6 +495,10 @@ parameters: description: Image name value: quay.io/redhat-services-prod/insights-management-tenant/insights-compliance/compliance-backend - name: IMAGE_DIGEST +- name: REGISTRY_IMG +- name: DEPLOY + generate: expression + from: '[ "{{ if ne .REGISTRY_IMG \"\" }}{{ .REGISTRY_IMG }}@{{ .IMAGE_DIGEST }}{{ else }}{{ .IMAGE }}:{{ .IMAGE_TAG }}{{ end }}" ]' - name: ENV_NAME description: ClowdEnv Name - name: REPLICAS_BACKEND