From c9ec8a63b22259c67532dbfa28ac19199dd6d1a7 Mon Sep 17 00:00:00 2001
From: Heba Elayoty <hebaelayoty@gmail.com>
Date: Wed, 17 Jan 2024 15:19:42 -0800
Subject: [PATCH] Fix e2e pipeline

Signed-off-by: Heba Elayoty <hebaelayoty@gmail.com>
---
 .github/workflows/aks-addon-tests.yml | 23 +++++++++--------------
 .github/workflows/e2e-tests.yml       | 18 ++++++------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/aks-addon-tests.yml b/.github/workflows/aks-addon-tests.yml
index cce3454c..f3cb8f19 100644
--- a/.github/workflows/aks-addon-tests.yml
+++ b/.github/workflows/aks-addon-tests.yml
@@ -12,18 +12,18 @@ on:
     branches: [master]
     paths-ignore: ['docs/**', '**.md', '**.mdx', '**.png', '**.jpg']
 
-permissions:
-  id-token: write
-  contents: read
-
 env:
   REGISTRY: ghcr.io
   # Common versions
   GO_VERSION: '1.20'
 
+permissions:
+  id-token: write # This is required for requesting the JWT
+  contents: read # This is required for actions/checkout
+
 jobs:
   export-registry:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       registry: ${{ steps.export.outputs.registry }}
     steps:
@@ -38,7 +38,7 @@ jobs:
     env:
       REGISTRY: ${{ needs.export-registry.outputs.registry }}
       E2E_IMG_TAG: "e2e-ci"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name:  Set up Go ${{ env.GO_VERSION }}
         uses: actions/setup-go@v5
@@ -65,16 +65,11 @@ jobs:
 
           echo "CLUSTER_NAME=aks-addon-vk-test${rand}" >> $GITHUB_ENV
 
-      - name: Install Azure CLI latest
-        run: |
-          curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
-          az version
-
       - uses: azure/login@v1.5.1
         with:
-          client-id: ${{ secrets.CLIENTID }}
-          tenant-id: ${{ secrets.TENANT_ID }}
-          subscription-id: ${{ secrets.SUBSCRIPTIONID }}
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Run e2e test
         run: |
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index ab449977..2fb46541 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -5,8 +5,7 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  workflow_dispatch:
-  pull_request_target:
+  pull_request:
     branches:
       - master
       - release-**
@@ -26,7 +25,7 @@ env:
 
 jobs:
   export-registry:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       registry: ${{ steps.export.outputs.registry }}
     steps:
@@ -41,7 +40,7 @@ jobs:
     env:
       REGISTRY: ${{ needs.export-registry.outputs.registry }}
       E2E_IMG_TAG: "e2e-ci"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name:  Set up Go ${{ env.GO_VERSION }}
         uses: actions/setup-go@v5
@@ -68,16 +67,11 @@ jobs:
 
           echo "CLUSTER_NAME=vk-aci-test${rand}" >> $GITHUB_ENV
 
-      - name: Install Azure CLI latest
-        run: |
-          curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
-          az version
-
       - uses: azure/login@v1.5.1
         with:
-          client-id: ${{ secrets.CLIENTID }}
-          tenant-id: ${{ secrets.TENANT_ID }}
-          subscription-id: ${{ secrets.SUBSCRIPTIONID }}
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Run e2e test
         run: |