From b3673bec0be7ee5c7796a8c9e39077b51facb7f5 Mon Sep 17 00:00:00 2001
From: anirudhprasad-sap <126493692+anirudhprasad-sap@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:26:19 +0100
Subject: [PATCH] [Misc] Release tag format update in workflow (#46)

---
 .github/workflows/docker-push.yml       |  7 +++----
 .github/workflows/generate-manifest.yml | 10 ++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index 259befc..790adf5 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -2,8 +2,7 @@ name: Docker push
 
 on:
   push:
-    tags: 
-      - manager/v[0-9]+.[0-9]+.[0-9]+*
+    tags: [ '[0-9]+.[0-9]+.[0-9]+' ]
     
 concurrency: release-${{ github.event.release.tag_name }}
 
@@ -48,7 +47,7 @@ jobs:
       with:
         images: ${{ steps.prepare-repository-name.outputs.repository }}
         tags: |
-          type=match,pattern=manager/v(.*),group=1,value=${{ github.event.release.tag_name }}
+          type=semver,pattern={{version}}
 
     - name: Build and push docker image
       uses: docker/build-push-action@v4
@@ -71,4 +70,4 @@ jobs:
     - name: Print Outputs
       run: |
         echo "Tags: ${{ steps.extract-metadata.outputs.tags }}"
-        echo "Labels: ${{ steps.extract-metadata.outputs.labels }}"
+        echo "Labels: ${{ steps.extract-metadata.outputs.labels }}"
\ No newline at end of file
diff --git a/.github/workflows/generate-manifest.yml b/.github/workflows/generate-manifest.yml
index dda9737..e786212 100644
--- a/.github/workflows/generate-manifest.yml
+++ b/.github/workflows/generate-manifest.yml
@@ -38,7 +38,7 @@ jobs:
           then
             echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
           else
-            echo "version=$(echo ${{ github.event.release.tag_name }} | grep -oP '(?<=\/v).*' )" >> $GITHUB_OUTPUT
+            echo "version=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
           fi
 
           if [[ ! -z '${{ inputs.upload_url }}' ]]
@@ -55,10 +55,12 @@ jobs:
         run: |
           echo "Version=${{ steps.get_version_upload_url.outputs.version }}"
 
-      - name: Update version in kustomization.yaml
+      - name: Update version in kustomization.yaml & default CRO
         run: |
           yq -i '.images[0].newTag="${{ steps.get_version_upload_url.outputs.version }}"' config/default/kustomization.yaml
-
+          yq -i '.labels[0].pairs."app.kubernetes.io/version"="${{ steps.get_version_upload_url.outputs.version }}"' config/default/kustomization.yaml
+          yq -i '.metadata.labels."app.kubernetes.io/version"="${{ steps.get_version_upload_url.outputs.version }}"' config/samples/operator_v1alpha1_capoperator.yaml
+      
       - name: Download kustomize cli
         run: |
           curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash
@@ -108,4 +110,4 @@ jobs:
             -H "Authorization: Bearer ${{ github.token }}" \
             -H "Content-Type: $(file -b --mime-type $file)" \
             --data-binary @$file \
-            "$upload_url?name=$(basename $file)"
+            "$upload_url?name=$(basename $file)"
\ No newline at end of file