Add helm mode test coverage for AKS BYOCNI

Fixes: #1566 Signed-off-by: Michi Mutsuzaki <[email protected]>
cilium · May 9, 2023 · 9a2f21a · 9a2f21a
1 parent 840b570
commit 9a2f21a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.github/in-cluster-test-scripts/aks-byocni-install.sh b/.github/in-cluster-test-scripts/aks-byocni-install.sh
@@ -10,4 +10,4 @@ cilium install \
   --wait=false \
   --helm-set loadBalancer.l7.backend=envoy \
   --helm-set tls.secretsBackend=k8s \
-  --config monitor-aggregation=none
+  --helm-set bpf.monitorAggregation=none
diff --git a/.github/workflows/aks-byocni.yaml b/.github/workflows/aks-byocni.yaml
@@ -36,7 +36,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  name: ${{ github.repository_owner }}-${{ github.event.repository.name }}-${{ github.run_id }}
   location: westeurope
   cost_reduction: --node-vm-size Standard_B2s --node-osdisk-size 30
   cilium_version: v1.13.2
@@ -47,6 +46,9 @@ jobs:
     if: ${{ github.repository == 'cilium/cilium-cli' }}
     runs-on: ubuntu-22.04
     timeout-minutes: 45
+    strategy:
+      matrix:
+        mode: ["classic", "helm"]
     steps:
       - name: Checkout
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
@@ -89,19 +91,20 @@ jobs:
 
           echo "sha=${SHA}" >> $GITHUB_OUTPUT
           echo "owner=${OWNER}" >> $GITHUB_OUTPUT
+          echo "name=${{ github.event.repository.name }}-${{ github.run_id }}-${{ matrix.mode }}" >> $GITHUB_OUTPUT
 
       - name: Create AKS cluster
         run: |
           # Create group
           az group create \
-            --name ${{ env.name }} \
+            --name ${{ steps.vars.outputs.name }} \
             --location ${{ env.location }} \
             --tags usage=${{ github.repository_owner }}-${{ github.event.repository.name }} owner=${{ steps.vars.outputs.owner }}
 
           # Create AKS cluster
           az aks create \
-            --resource-group ${{ env.name }} \
-            --name ${{ env.name }} \
+            --resource-group ${{ steps.vars.outputs.name }} \
+            --name ${{ steps.vars.outputs.name }} \
             --location ${{ env.location }} \
             --network-plugin none \
             --node-count 2 \
@@ -111,8 +114,8 @@ jobs:
       - name: Get cluster credentials
         run: |
           az aks get-credentials \
-            --resource-group ${{ env.name }} \
-            --name ${{ env.name }}
+            --resource-group ${{ steps.vars.outputs.name }} \
+            --name ${{ steps.vars.outputs.name }}
 
       - name: Create kubeconfig and load it in configmap
         run: |
@@ -130,7 +133,8 @@ jobs:
             --set job_name=cilium-cli-install \
             --set test_script_cm=cilium-cli-test-script-install \
             --set tag=${{ steps.vars.outputs.sha }} \
-            --set cilium_version=${{ env.cilium_version }}
+            --set cilium_version=${{ env.cilium_version }} \
+            --set cilium_cli_mode=${{ matrix.mode }}
 
       - name: Wait for install job
         env:
@@ -163,7 +167,8 @@ jobs:
             --generate-name \
             --set job_name=cilium-cli \
             --set test_script_cm=cilium-cli-test-script \
-            --set tag=${{ steps.vars.outputs.sha }}
+            --set tag=${{ steps.vars.outputs.sha }} \
+            --set cilium_cli_mode=${{ matrix.mode }}
 
       - name: Wait for test job
         env:
@@ -205,7 +210,7 @@ jobs:
       - name: Clean up AKS
         if: ${{ always() }}
         run: |
-          az group delete --name ${{ env.name }} --yes --no-wait
+          az group delete --name ${{ steps.vars.outputs.name }} --yes --no-wait
         shell: bash {0} # Disable default fail-fast behaviour so that all commands run independently
 
       - name: Upload artifacts