ci: restructure workflows

Author: andhreljaKern

.github/workflows/az_acr_delete.yml

@@ -0,0 +1,35 @@
+name: 'ACR: Delete Docker Image'
+
+on:
+  workflow_call:
+    inputs:
+      image_tag:
+        description: 'Image Tag'
+        required: true
+        type: string
+
+jobs:
+  az-acr-delete:
+    name: "ACR: Delete Test Image"
+    runs-on: ubuntu-latest
+    environment: dev
+    env:
+      AZURE_CONTAINER_REGISTRY: ${{ vars.AZURE_CONTAINER_REGISTRY }}
+      ACR_LOGIN_USERNAME: ${{ secrets.ACR_LOGIN_USERNAME }}
+      ACR_LOGIN_PASSWORD: ${{ secrets.ACR_LOGIN_PASSWORD }}
+    steps:
+      - name: Azure Cloud Login
+        uses: Azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+      
+      - name: Delete Test Container Image
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            az acr repository delete \
+              --name ${{ env.AZURE_CONTAINER_REGISTRY }} \
+              --image ${{ github.event.repository.name }}:${{ inputs.image_tag }} \
+              --yes

.github/workflows/az_acr_test.yml

@@ -0,0 +1,37 @@
+name: 'ACR: Docker Push Test'
+
+on:
+  workflow_call:
+
+jobs:
+  az-acr-push:
+    name: "Docker: Build & Push (Test)"
+    runs-on: ubuntu-latest
+    environment: dev
+    env:
+      AZURE_CONTAINER_REGISTRY: ${{ vars.AZURE_CONTAINER_REGISTRY }}
+      ACR_LOGIN_USERNAME: ${{ secrets.ACR_LOGIN_USERNAME }}
+      ACR_LOGIN_PASSWORD: ${{ secrets.ACR_LOGIN_PASSWORD }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3      
+      - name: Log into registry
+        uses: docker/login-action@v3
+        with:
+          registry: "${{ env.AZURE_CONTAINER_REGISTRY }}"
+          username: "${{ env.ACR_LOGIN_USERNAME }}"
+          password: "${{ env.ACR_LOGIN_PASSWORD }}"
+      
+      - name: Build & Push ${{ github.event.repository.name }}:test-${{ github.head_ref }}
+        uses: docker/build-push-action@v5
+        with:
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          file: 'dev.Dockerfile'
+          tags: ${{ env.AZURE_CONTAINER_REGISTRY }}/${{ github.event.repository.name }}:test-${{ github.head_ref }}
+          push: true
+          build-args: |
+            platform=linux/amd64
+            label=dockerfile-path=https://github.com/${{ github.repository }}/blob/${{ github.sha }}/dev.Dockerfile

.github/workflows/k8s_test.yml

@@ -15,40 +15,14 @@ permissions:
   actions: read
 
 jobs:
-  az-acr-push:
-    name: "Docker: Build & Push (Test)"
-    runs-on: ubuntu-latest
-    environment: dev
-    env:
-      AZURE_CONTAINER_REGISTRY: ${{ vars.AZURE_CONTAINER_REGISTRY }}
-      ACR_LOGIN_USERNAME: ${{ secrets.ACR_LOGIN_USERNAME }}
-      ACR_LOGIN_PASSWORD: ${{ secrets.ACR_LOGIN_PASSWORD }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3      
-      - name: Log into registry
-        uses: docker/login-action@v3
-        with:
-          registry: "${{ env.AZURE_CONTAINER_REGISTRY }}"
-          username: "${{ env.ACR_LOGIN_USERNAME }}"
-          password: "${{ env.ACR_LOGIN_PASSWORD }}"
-      
-      - name: Build & Push ${{ github.event.repository.name }}:test-${{ github.head_ref }}
-        uses: docker/build-push-action@v5
-        with:
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          file: 'dev.Dockerfile'
-          tags: ${{ env.AZURE_CONTAINER_REGISTRY }}/${{ github.event.repository.name }}:test-${{ github.head_ref }}
-          push: true
-          build-args: platform=linux/amd64
+  call-az-acr-push:
+    uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/az_acr_test.yml@dev
+    secrets: inherit
 
   k8-test:
     name: 'K8: Test'
     runs-on: ubuntu-latest
-    needs: [az-acr-push]
+    needs: [call-az-acr-push]
     environment: dev
     env:
       KUBELOGIN_VERSION: "v0.0.25"
@@ -95,32 +69,13 @@ jobs:
         bash cicd-deployment-scripts/k8s/test.sh \
           -n ${{ env.KUBERNETES_NAMESPACE }} \
           -d ${{ github.event.repository.name }} \
-          -h ${{ github.head_ref }} \
+          -t test-${{ github.head_ref }} \
           -r ${{ env.AZURE_CONTAINER_REGISTRY }} \
-          -t "${{ inputs.test_cmd }}"
+          -c "${{ inputs.test_cmd }}"
 
-  az-acr-delete:
-    name: "ACR: Delete Test Image"
-    runs-on: ubuntu-latest
+  call-az-acr-delete:
+    uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/az_acr_delete.yml@dev
     needs: [k8-test]
-    environment: dev
-    env:
-      AZURE_CONTAINER_REGISTRY: ${{ vars.AZURE_CONTAINER_REGISTRY }}
-      ACR_LOGIN_USERNAME: ${{ secrets.ACR_LOGIN_USERNAME }}
-      ACR_LOGIN_PASSWORD: ${{ secrets.ACR_LOGIN_PASSWORD }}
-    steps:
-      - name: Azure Cloud Login
-        uses: Azure/login@v2
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      
-      - name: Delete Test Container Image
-        uses: azure/cli@v2
-        with:
-          inlineScript: |
-            az acr repository delete \
-              --name ${{ env.AZURE_CONTAINER_REGISTRY }} \
-              --image ${{ github.event.repository.name }}:test-${{ github.head_ref }} \
-              --yes
+    secrets: inherit
+    with:
+      image_tag: "test-${{ github.head_ref }}"

k8s/test.sh

@@ -3,7 +3,7 @@ set -e
 
 KUBERNETES_NAMESPACE=""
 KUBERNETES_DEPLOYMENT_NAME=""
-GITHUB_HEAD_REF=""
+TEST_IMAGE_TAG=""
 AZURE_CONTAINER_REGISTRY=""
 TEST_CMD=""
 
@@ -12,9 +12,9 @@ do
     case "${flag}" in
         n) KUBERNETES_NAMESPACE=${OPTARG};;
         d) KUBERNETES_DEPLOYMENT_NAME=${OPTARG};;
-        h) GITHUB_HEAD_REF=${OPTARG};;
+        t) TEST_IMAGE_TAG=${OPTARG};;
         r) AZURE_CONTAINER_REGISTRY=${OPTARG};;
-        t) TEST_CMD=${OPTARG};;
+        c) TEST_CMD=${OPTARG};;
     esac
 done
 
@@ -25,8 +25,8 @@ KUBERNETES_POD_EXISTING_IMAGE=$(kubectl get pod --output json \
     --selector app=${KUBERNETES_DEPLOYMENT_NAME} \
     | jq -r '.items[0] | .spec.containers[0].image')
 
-kubectl set image deployment/${KUBERNETES_DEPLOYMENT_NAME} ${KUBERNETES_DEPLOYMENT_NAME}=${AZURE_CONTAINER_REGISTRY}/${KUBERNETES_DEPLOYMENT_NAME}:test-${GITHUB_HEAD_REF}
-echo "::warning::using ${AZURE_CONTAINER_REGISTRY}/${KUBERNETES_DEPLOYMENT_NAME}:test-${GITHUB_HEAD_REF}"
+kubectl set image deployment/${KUBERNETES_DEPLOYMENT_NAME} ${KUBERNETES_DEPLOYMENT_NAME}=${AZURE_CONTAINER_REGISTRY}/${KUBERNETES_DEPLOYMENT_NAME}:${TEST_IMAGE_TAG}
+echo "::warning::using ${AZURE_CONTAINER_REGISTRY}/${KUBERNETES_DEPLOYMENT_NAME}:${TEST_IMAGE_TAG}"
 
 kubectl rollout status deployment ${KUBERNETES_DEPLOYMENT_NAME}