From 312834bbd905f593503c9cf75273e5ccf9c54b9a Mon Sep 17 00:00:00 2001
From: Miguel Crespo <162333021+miguel-crespo-fdc@users.noreply.github.com>
Date: Tue, 13 Aug 2024 15:53:07 +0100
Subject: [PATCH] fix: release tag CLI  (#1869)

CLI needs to be a separate step for the release.yaml, as we dont store
it on the github registry. regular makefile target pullls tags and
pushes from both
Ref: SRX-6SQ4UE
---
 .github/workflows/release.yml | 7 +++++++
 Makefile                      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 64931f761..6b0a2b327 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,6 +46,13 @@ jobs:
           make tag-release-images RELEASE_IMAGE_TAG=v$RELEASE_IMAGE_VERSION
         env:
           RELEASE_IMAGE_VERSION: ${{ steps.new-semrel-version.outputs.version }}
+      - name: Re-tag CLI service image with release version for google docker registry
+        run: |
+          echo 'If this step fails, ensure that the main github action is done. We rely on it to get the docker images.'
+          git fetch --tags # this should have been done by the checkout action before.
+          make tag-cli-release-image RELEASE_IMAGE_TAG=v$RELEASE_IMAGE_VERSION
+        env:
+          RELEASE_IMAGE_VERSION: ${{ steps.new-semrel-version.outputs.version }}
       - name: Re-tag service images with release version for github docker registry
         run: |
           make tag-release-images RELEASE_IMAGE_TAG=v$RELEASE_IMAGE_VERSION DOCKER_REGISTRY_URI=ghcr.io/freiheit-com/kuberpult
diff --git a/Makefile b/Makefile
index 0f7a98d41..a7244e051 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ push-service-image/%: tag-service-image/%
 	docker push $(DOCKER_REGISTRY_URI)/$*:$(RELEASE_IMAGE_TAG)-datadog
 
 .PHONY: tag-release-images
-tag-release-images: $(foreach i,$(SERVICE_IMAGES),push-service-image/$i) tag-cli-release-image
+tag-release-images: $(foreach i,$(SERVICE_IMAGES),push-service-image/$i)
 	true
 
 # CLI is only stored in gcp docker registry