From 94283c52ec247d9c62e526dec99c62e082570487 Mon Sep 17 00:00:00 2001
From: Anish Ramasekar <anish.ramasekar@gmail.com>
Date: Fri, 23 Feb 2024 12:32:49 -0800
Subject: [PATCH] ci: enable tests with kubernetes v1.29 (#1230)

Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
---
 .pipelines/nightly.yaml | 18 ++++++++------
 .pipelines/pr.yaml      | 54 +++++++++++++++++++++++++++++++++++------
 Makefile                |  4 +--
 README.md               |  4 +--
 4 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/.pipelines/nightly.yaml b/.pipelines/nightly.yaml
index 7a2dbc486..20a0d0001 100644
--- a/.pipelines/nightly.yaml
+++ b/.pipelines/nightly.yaml
@@ -114,6 +114,8 @@ jobs:
         upgrade_aks_linux:
           GINKGO_SKIP: \[AKSSoakOnly\]
   - job:
+    # using the tmp pool as a workaround for the kind cluster creation issue.
+    pool: tmp-staging-pool-amd64-mariner-2
     timeoutInMinutes: 60
     dependsOn:
       - scan_images
@@ -135,14 +137,14 @@ jobs:
         value: "true"
     strategy:
       matrix:
-        kind_v1_24_12:
-          KIND_NODE_VERSION: v1.24.12
-        kind_v1_25_8:
-          KIND_NODE_VERSION: v1.25.8
-        kind_v1_26_3:
-          KIND_NODE_VERSION: v1.26.3
-        kind_v1_27_1:
-          KIND_NODE_VERSION: v1.27.1
+        kind_v1_26_14:
+          KIND_NODE_VERSION: v1.26.14
+        kind_v1_27_11:
+          KIND_NODE_VERSION: v1.27.11
+        kind_v1_28_7:
+          KIND_NODE_VERSION: v1.28.7
+        kind_v1_29_2:
+          KIND_NODE_VERSION: v1.29.2
     steps:
       - script: make test-e2e
         displayName: Webhook E2E test suite
diff --git a/.pipelines/pr.yaml b/.pipelines/pr.yaml
index 589e801ed..3eaa0d19f 100644
--- a/.pipelines/pr.yaml
+++ b/.pipelines/pr.yaml
@@ -92,20 +92,58 @@ jobs:
         aks_linux:
           REGISTRY: upstream.azurecr.io/azure-workload-identity
           GINKGO_SKIP: \[AKSSoakOnly\]
-        kind_v1_24_12:
-          KIND_NODE_VERSION: v1.24.12
+    steps:
+      - script: echo "##vso[task.setvariable variable=CLUSTER_NAME]azwi-e2e-$(openssl rand -hex 2)"
+        displayName: Set CLUSTER_NAME
+        condition: ne(variables.LOCAL_ONLY, 'true')
+      - script: make test-e2e
+        displayName: Webhook E2E test suite
+        env:
+          APPLICATION_CLIENT_ID: $(APPLICATION_CLIENT_ID)
+          AZURE_TENANT_ID: $(AZURE_TENANT_ID)
+          KEYVAULT_URL: $(KEYVAULT_URL)
+          KEYVAULT_SECRET_NAME: $(KEYVAULT_SECRET_NAME)
+          SERVICE_ACCOUNT_ISSUER: $(SERVICE_ACCOUNT_ISSUER)
+          SERVICE_ACCOUNT_KEYVAULT_NAME: $(SERVICE_ACCOUNT_KEYVAULT_NAME)
+      - script: az group delete --name "${CLUSTER_NAME}" --yes --no-wait || true
+        displayName: Cleanup
+        condition: ne(variables.LOCAL_ONLY, 'true')
+      - template: templates/publish-logs.yaml
+  - job:
+    timeoutInMinutes: 60
+    # using the tmp pool as a workaround for the kind cluster creation issue.
+    pool: tmp-staging-pool-amd64-mariner-2
+    dependsOn:
+    - lint
+    - scan_images
+    - shellcheck
+    workspace:
+      clean: all
+    variables:
+      # contains the following environment variables:
+      # - APPLICATION_CLIENT_ID
+      # - AZURE_TENANT_ID
+      # - KEYVAULT_URL
+      # - KEYVAULT_SECRET_NAME
+      # - SERVICE_ACCOUNT_ISSUER
+      # - SERVICE_ACCOUNT_KEYVAULT_NAME
+      - group: e2e-environment-variables
+    strategy:
+      matrix:
+        kind_v1_26_14:
+          KIND_NODE_VERSION: v1.26.14
           LOCAL_ONLY: "true"
           TEST_HELM_CHART: "true"
-        kind_v1_25_8:
-          KIND_NODE_VERSION: v1.25.8
+        kind_v1_27_11:
+          KIND_NODE_VERSION: v1.27.11
           LOCAL_ONLY: "true"
           TEST_HELM_CHART: "true"
-        kind_v1_26_3:
-          KIND_NODE_VERSION: v1.26.3
+        kind_v1_28_7:
+          KIND_NODE_VERSION: v1.28.7
           LOCAL_ONLY: "true"
           TEST_HELM_CHART: "true"
-        kind_v1_27_1:
-          KIND_NODE_VERSION: v1.27.1
+        kind_v1_29_2:
+          KIND_NODE_VERSION: v1.29.2
           LOCAL_ONLY: "true"
           TEST_HELM_CHART: "true"
     steps:
diff --git a/Makefile b/Makefile
index bfcce5280..3fd87b727 100644
--- a/Makefile
+++ b/Makefile
@@ -43,11 +43,11 @@ GINKGO_VER := v2.1.6
 GINKGO_BIN := ginkgo
 GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
 
-KIND_VER := v0.18.0
+KIND_VER := v0.21.0
 KIND_BIN := kind
 KIND := $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER)
 
-KUBECTL_VER := v1.22.4
+KUBECTL_VER := v1.29.0
 KUBECTL_BIN := kubectl
 KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
 
diff --git a/README.md b/README.md
index 05b5afd09..352302914 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ Azure AD Workload Identity is the next iteration of [Azure AD Pod Identity][1] t
 
 | Kubernetes Version | Supported |
 | ------------------ | --------- |
+| 1.29               | ✅         |
+| 1.28               | ✅         |
 | 1.27               | ✅         |
 | 1.26               | ✅         |
-| 1.25               | ✅         |
-| 1.24               | ✅         |
 
 ## Installation