From 427e7a8382ce71c67bceb000b02f5f8b93af1e8a Mon Sep 17 00:00:00 2001
From: Carsten Schafer <Carsten.Schafer@kinarasystems.com>
Date: Thu, 19 Sep 2024 09:28:31 -0400
Subject: [PATCH] WIFI-13821 rework gh CGW deploy action-5

Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com>
---
 .github/workflows/cgw-dev-deployment.yaml | 31 +++++++++++------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/cgw-dev-deployment.yaml b/.github/workflows/cgw-dev-deployment.yaml
index 97f618e50..12b4c4c06 100644
--- a/.github/workflows/cgw-dev-deployment.yaml
+++ b/.github/workflows/cgw-dev-deployment.yaml
@@ -100,17 +100,16 @@ jobs:
 
       - name: Checkout cgw repo
         uses: actions/checkout@v4
-        env:
-          VERSION: ${{ github.events.inputs.cgw_version }}
         with:
           repository: Telecominfraproject/openlan-cgw
           path: openlan-cgw
-          ref: ${{ env.VERSION }}
+          ref: ${{ github.event.inputs.cgw_version }}
 
       - name: Fetch kubeconfig
+        env:
+          AWS_DEFAULT_REGION: ${{ github.event.inputs.region }}
         run: |
-          export AWS_DEFAULT_REGION=${{ github.events.inputs.region }}
-          aws eks update-kubeconfig --name ${{ github.events.inputs.cluster }}
+          aws eks update-kubeconfig --name ${{ github.event.inputs.cluster }}
 
       - name: Install kubectl, helmfile and plugins
         run: |
@@ -137,31 +136,31 @@ jobs:
         if: ${{ github.event.inputs.upgrade }} == "false"
         working-directory: wlan-cloud-ucentral-deploy/cgw
         run: |
-          helm ls -n ${{ github.events.inputs.namespace }}
+          helm ls -n ${{ github.event.inputs.namespace }}
           echo "If already installed then it may not be possible to upgrade service components"
-          helmfile --environment ${{ github.events.inputs.config_name }} \
-            --state-values-set "cgw.tag=${{ github.events.inputs.cgw_image }}" \
+          helmfile --environment ${{ github.event.inputs.config_name }} \
+            --state-values-set "cgw.tag=${{ github.event.inputs.cgw_image }}" \
             apply
 
       - name: Deploy OpenLAN Cloud Gateway only
         if: ${{ github.event.inputs.upgrade }} == "true"
         working-directory: wlan-cloud-ucentral-deploy/cgw
         run: |
-          helm ls -n {{ github.events.inputs.namespace }}
-          helmfile --environment ${{ github.events.inputs.config_name }} -l app=cgw \
-              --state-values-set "cgw.tag=${{ github.events.inputs.cgw_image }}" \
+          helm ls -n ${{ github.event.inputs.namespace }}
+          helmfile --environment ${{ github.event.inputs.config_name }} -l app=cgw \
+              --state-values-set "cgw.tag=${{ github.event.inputs.cgw_image }}" \
               apply
 
       - name: Show resource state on deployment failure
         if: failure()
         run: |
           echo "Deploy/STS:"
-          kubectl get deploy,sts --namespace {{ github.events.inputs.namespace }} -o wide
+          kubectl get deploy,sts --namespace ${{ github.event.inputs.namespace }} -o wide
           echo "Pods:"
-          kubectl get pods --namespace {{ github.events.inputs.namespace }} -o wide
+          kubectl get pods --namespace ${{ github.event.inputs.namespace }} -o wide
           echo "Pod Descriptions:"
-          kubectl describe pods --namespace {{ github.events.inputs.namespace }}
+          kubectl describe pods --namespace ${{ github.event.inputs.namespace }}
           echo "Services:"
-          kubectl get services --namespace {{ github.events.inputs.namespace }} -o wide
+          kubectl get services --namespace ${{ github.event.inputs.namespace }} -o wide
           echo "Service Descriptions:"
-          kubectl describe services --namespace {{ github.events.inputs.namespace }}
+          kubectl describe services --namespace ${{ github.event.inputs.namespace }}