Update deployment configuration and values.yaml

Author: tsviz

.github/workflows/cd.yml

@@ -96,33 +96,37 @@ jobs:
       - name: Deploy to Kubernetes [PRODUCTION ENVIRONMENT]
         run: |
           # Get the commit message of the commit that triggered the workflow
-          COMMIT_MESSAGE=$(git log --format=%B -n 1 ${{ github.event.after }})
-          
+          COMMIT_MESSAGE=$(git log --format=%B -n 1 HEAD)
+
           # Check if the app deployment exists
-          if kubectl get deployments app-release; then
+          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
+            CURRENT_V1_IMAGE_TAG=$(kubectl get pods -l app=spring-app -o json | jq -r '.items[] | select(.metadata.name | contains("v1")) | .spec.containers[0].image' | cut -d ":" -f 2 | head -n 1)
+            CURRENT_V2_IMAGE_TAG=$(kubectl get pods -l app=spring-app -o json | jq -r '.items[] | select(.metadata.name | contains("v2")) | .spec.containers[0].image' | cut -d ":" -f 2 | head -n 1)
+            
+            echo "Current v1 image tag: $CURRENT_V1_IMAGE_TAG"
+            echo "Current v2 image tag: $CURRENT_V2_IMAGE_TAG"
+            
             # 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."
-              # Fetch the current v2 image tag from the running pods - this is to ensure the v2.image.tag is not changed from the values.yaml file
-              CURRENT_V2_IMAGE_TAG=$(kubectl get pods -l app=spring-app -o jsonpath="{.items[0].spec.containers[0].image}" | cut -d ":" -f 2)
               # 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
-
             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 }}
+              helm upgrade --install app-release ./my-chart --set v2.image.tag=${{ inputs.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 regardless of the commit message
+            # 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 }}
           fi
-          
+
           # Wait for 30 seconds
           sleep 30
-          
+
           # Get the status of the deployments
           kubectl get deployments

.gitignore

@@ -3,4 +3,5 @@ target/
 nohup.out
 .vscode/
 split_tests.sh
-*.db
+*.db
+test_deployment.sh

my-chart/values.yaml

@@ -12,11 +12,11 @@ v1:
       tag: "196"
     resources:
       limits:
-        cpu: "0.5"
-        memory: 256Mi
+        cpu: "1"
+        memory: 512Mi
       requests:
-        cpu: 125m
-        memory: 64Mi
+        cpu: 250m
+        memory: 128Mi
 v2:
   replicas: 4
   springAppContainer:
@@ -31,11 +31,11 @@ v2:
       tag: "197"
     resources:
       limits:
-        cpu: "0.5"
-        memory: 256Mi
+        cpu: "1"
+        memory: 512Mi
       requests:
-        cpu: 125m
-        memory: 64Mi
+        cpu: 250m
+        memory: 128Mi
 kubernetesClusterDomain: cluster.local
 postgresConfig:
   POSTGRES_DB: postgresdb