Separate manifest list creation for commit-sha and release tags

Signed-off-by: Shiva Krishna, Merla <smerla@nvidia.com>

Author: shivamerla

.github/workflows/golang.yml

@@ -56,6 +56,7 @@ jobs:
       with:
         oidc-provider-name: nvgithub
         oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
+        cache: true
     - name: Check golang modules
       env:
         OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }}
@@ -103,6 +104,7 @@ jobs:
       with:
         oidc-provider-name: nvgithub
         oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
+        cache: true
     - name: Run Coverage
       env:
         OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }}
@@ -141,6 +143,7 @@ jobs:
       with:
         oidc-provider-name: nvgithub
         oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
+        cache: true
     - name: Run Build
       env:
         OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }}

.github/workflows/image.yml

@@ -70,6 +70,7 @@ jobs:
         with:
           oidc-provider-name: nvgithub
           oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
+          cache: true
       - name: Build image
         env:
           IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/k8s-nim-operator
@@ -129,6 +130,7 @@ jobs:
         with:
           oidc-provider-name: nvgithub
           oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
+          cache: true
       - name: Build image
         env:
           IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/k8s-nim-operator
@@ -168,24 +170,31 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build Manifest
+      # Always create/push the commit-SHA manifest
+      - name: Build Manifest (commit SHA)
         env:
           OPERATOR_IMAGE_ARM: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/k8s-nim-operator:${{ env.COMMIT_SHORT_SHA }}-arm64
-          OPERATOR_IMAGE_AMD: ghcr.io/${{ env.LOWERCASE_REPO_OWNER}}/k8s-nim-operator:${{ env.COMMIT_SHORT_SHA }}-amd64
+          OPERATOR_IMAGE_AMD: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/k8s-nim-operator:${{ env.COMMIT_SHORT_SHA }}-amd64
           OPERATOR_MULTIARCH_IMAGE: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/k8s-nim-operator:${{ env.COMMIT_SHORT_SHA }}
-          OPERATOR_MULTIARCH_IMAGE_BRANCH: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/k8s-nim-operator:${{ env.BRANCH }}
         run: |
           docker manifest create \
-            ${OPERATOR_MULTIARCH_IMAGE} \
-            ${OPERATOR_IMAGE_AMD} \
-            ${OPERATOR_IMAGE_ARM}
-          docker manifest push ${OPERATOR_MULTIARCH_IMAGE}
-    
+            "${OPERATOR_MULTIARCH_IMAGE}" \
+            "${OPERATOR_IMAGE_AMD}" \
+            "${OPERATOR_IMAGE_ARM}"
+          docker manifest push "${OPERATOR_MULTIARCH_IMAGE}"
+      # Only create/push the branch-name manifest on main or release-* branches
+      - name: Build Manifest (branch tag)
+        if: ${{ github.ref_name == 'main' || startsWith(github.ref_name, 'release-') }}
+        env:
+          OPERATOR_IMAGE_ARM: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/k8s-nim-operator:${{ env.COMMIT_SHORT_SHA }}-arm64
+          OPERATOR_IMAGE_AMD: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/k8s-nim-operator:${{ env.COMMIT_SHORT_SHA }}-amd64
+          OPERATOR_MULTIARCH_IMAGE_BRANCH: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/k8s-nim-operator:${{ env.BRANCH }}
+        run: |
           docker manifest create \
-            ${OPERATOR_MULTIARCH_IMAGE_BRANCH} \
-            ${OPERATOR_IMAGE_AMD} \
-            ${OPERATOR_IMAGE_ARM}
-          docker manifest push ${OPERATOR_MULTIARCH_IMAGE_BRANCH}
+            "${OPERATOR_MULTIARCH_IMAGE_BRANCH}" \
+            "${OPERATOR_IMAGE_AMD}" \
+            "${OPERATOR_IMAGE_ARM}"
+          docker manifest push "${OPERATOR_MULTIARCH_IMAGE_BRANCH}"
   build-bundle:
     runs-on: ubuntu-latest
     needs: build-image-multi-arch