Refactor GitHub Actions workflow for updating Kustomize overlay

Author: sugesh-cloudops

.github/workflows/kustomize-ci.yaml

@@ -57,55 +57,38 @@ jobs:
 
             sed -i.bak -E "s|image:.*|image: ${IMAGE_NAME}:${IMAGE_TAG}|" "$FILE"
 
-      - name: Commit and push changes
-        env:
-          TOKEN: ${{ secrets.GH_PAT }}
-          IMAGE_TAG: ${{ env.IMAGE_TAG }}
-        run: |
-            git config --global user.name "${{ secrets.GIT_USER_NAME }}"
-            git config --global user.email "${{ secrets.GIT_USER_EMAIL }}"
-
-            git remote set-url origin https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ github.repository }}.git
-            git remote set-url origin https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ github.repository }}.git
-
-
-            git add kustomize/overlays/dev/patch-deployment-image.yaml
-            git commit -m "Update latest image tag to $IMAGE_TAG"
-            git push
 
+  update-kustomize:
+      name: Update Kustomize Overlay
+      needs: build-and-push
+      runs-on: ubuntu-latest
 
-  # update-kustomize:
-  #     name: Update Kustomize Overlay
-  #     needs: build-and-push
-  #     runs-on: ubuntu-latest
+      env:
+        IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/springboot-postgres
+        IMAGE_TAG: ${{ needs.build-and-push.outputs.image-tag }}
 
-  #     env:
-  #       IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/springboot-postgres
-  #       IMAGE_TAG: ${{ needs.build-and-push.outputs.image-tag }}
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v4
 
-  #     steps:
-  #       - name: Checkout code
-  #         uses: actions/checkout@v4
-
-  #       - name: Update image tag in dev overlay
-  #         run: |
-  #           FILE="kustomize/overlays/dev/patch-deployment-image.yaml"
+        - name: Update image tag in dev overlay
+          run: |
+            FILE="kustomize/overlays/dev/patch-deployment-image.yaml"
 
-  #           echo "Updating $FILE with image: $IMAGE_NAME:$IMAGE_TAG"
+            echo "Updating $FILE with image: $IMAGE_NAME:$IMAGE_TAG"
 
-  #           sed -i.bak -E "s|image:.*|image: ${IMAGE_NAME}:${IMAGE_TAG}|" "$FILE"
+            sed -i.bak -E "s|image:.*|image: ${IMAGE_NAME}:${IMAGE_TAG}|" "$FILE"
 
-  #       - name: Commit and push changes
-  #         env:
-  #           TOKEN: ${{ secrets.GH_PAT }}
-  #           IMAGE_TAG: ${{ env.IMAGE_TAG }}
-  #         run: |
-  #           git config --global user.name ${{ secrets.GIT_USER_EMAIL }}
-  #           git config --global user.email ${{ secrets.GIT_USER_NAME }}
+        - name: Commit and push changes
+          run: |
+            git config --global user.name "${{ secrets.GIT_USER_NAME }}"
+            git config --global user.email "${{ secrets.GIT_USER_EMAIL }}"
 
-  #           git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}.git
 
+            git remote set-url origin https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ github.repository }}.git
 
-  #           git add kustomize/overlays/dev/patch-deployment-image.yaml
-  #           git commit -m "Update latest image tag to $IMAGE_TAG"
-  #           git push
+            git add kustomize/overlays/dev/patch-deployment-image.yaml
+            git commit -m "Update latest image tag to $IMAGE_TAG" || echo "No changes to commit"
+            git push
+          env:
+            IMAGE_TAG: ${{ github.sha }}