Update image tag handling in CD workflow

Author: tsviz

.github/workflows/cd.yml

@@ -98,6 +98,9 @@ jobs:
           # Get the commit message of the commit that triggered the workflow
           COMMIT_MESSAGE=$(git log --format=%B -n 1 HEAD)
 
+          # Extract just the tagname from inputs.image_tag
+          IMAGE_TAG=$(echo "${{ inputs.image_tag }}" | cut -d ":" -f 2)
+
           # Check if the app deployment exists
           if kubectl get deployments app-release-my-chart-v1 && kubectl get deployments app-release-my-chart-v2; then
             # Get the current v1 and v2 image tags from the app deployment in the cluster
@@ -110,19 +113,19 @@ jobs:
             # If the commit message starts with [v1], it's an update for v1
             if [[ "$COMMIT_MESSAGE" == \[v1\]* ]]; then
               echo "Update is for v1. Not setting v2.image.tag."
-              # Update the app without changing the v2 image but instead change the v1 image to inputs.image_tag ensure the v2.image.tag is not changed from the values.yaml file
-              helm upgrade --install app-release ./my-chart --set v1.image.tag=${{ inputs.image_tag }},v2.image.tag=$CURRENT_V2_IMAGE_TAG
+              # Update the app without changing the v2 image but instead change the v1 image to IMAGE_TAG ensure the v2.image.tag is not changed from the values.yaml file
+              helm upgrade --install app-release ./my-chart --set v1.image.tag=$IMAGE_TAG,v2.image.tag=$CURRENT_V2_IMAGE_TAG
             else
               # If the commit message does not start with [v1], it's an update for v2
-              echo "Update is for v2. Setting v2.image.tag to: ${{ inputs.image_tag }}."
-              # Update the app and change the v2 image to inputs.image_tag
-              helm upgrade --install app-release ./my-chart --set v2.image.tag=${{ inputs.image_tag }},v1.image.tag=$CURRENT_V1_IMAGE_TAG
+              echo "Update is for v2. Setting v2.image.tag to: $IMAGE_TAG."
+              # Update the app and change the v2 image to IMAGE_TAG
+              helm upgrade --install app-release ./my-chart --set v2.image.tag=$IMAGE_TAG,v1.image.tag=$CURRENT_V1_IMAGE_TAG
             fi
           else
             # If the app deployment does not exist
-            echo "App deployment does not exist. Setting v2.image.tag to: ${{ inputs.image_tag }}."
-            # Set v2.image.tag to inputs.image_tag as a new deployment starting point and leave v1.image.tag as the default value in the values.yaml file
-            helm upgrade --install app-release ./my-chart --set v2.image.tag=${{ inputs.image_tag }}
+            echo "App deployment does not exist. Setting v2.image.tag to: $IMAGE_TAG."
+            # Set v2.image.tag to IMAGE_TAG as a new deployment starting point and leave v1.image.tag as the default value in the values.yaml file
+            helm upgrade --install app-release ./my-chart --set v2.image.tag=$IMAGE_TAG
           fi
 
           # Wait for 30 seconds