From 9dcb673162699b4aeea4126ad89147ec693ee89e Mon Sep 17 00:00:00 2001
From: Camila Macedo <camilamacedo86@gmail.com>
Date: Sat, 6 Apr 2024 06:40:50 +0100
Subject: [PATCH] Update Kind config to latest 1.29

---
 test/common.sh                  |  5 +++--
 test/e2e/kind-config-v1.18.yaml | 30 ------------------------------
 test/e2e/kind-config-v1.19.yaml |  1 -
 test/e2e/kind-config.yaml       | 13 +++++++++++++
 4 files changed, 16 insertions(+), 33 deletions(-)
 delete mode 100644 test/e2e/kind-config-v1.18.yaml
 delete mode 120000 test/e2e/kind-config-v1.19.yaml

diff --git a/test/common.sh b/test/common.sh
index 582203cd913..bdac1fdae08 100644
--- a/test/common.sh
+++ b/test/common.sh
@@ -31,6 +31,7 @@ function convert_to_tools_ver {
   "1.26") echo "1.26.0";;
   "1.27") echo "1.27.1";;
   "1.28") echo "1.28.3";;
+  "1.29") echo "1.29.2";;
   *)
     echo "k8s version $k8s_ver not supported"
     exit 1
@@ -50,9 +51,9 @@ if [ -n "$TRACE" ]; then
   set -x
 fi
 
-export KIND_K8S_VERSION="${KIND_K8S_VERSION:-"v1.28.0"}"
+export KIND_K8S_VERSION="${KIND_K8S_VERSION:-"v1.29.0"}"
 tools_k8s_version=$(convert_to_tools_ver "${KIND_K8S_VERSION#v*}")
-kind_version=0.20.0
+kind_version=0.22.0
 goarch=amd64
 
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
diff --git a/test/e2e/kind-config-v1.18.yaml b/test/e2e/kind-config-v1.18.yaml
deleted file mode 100644
index 1e23fe5e648..00000000000
--- a/test/e2e/kind-config-v1.18.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-#  Copyright 2022 The Kubernetes Authors.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-nodes:
-  - role: control-plane
-kubeadmConfigPatches:
-- |
-  kind: ClusterConfiguration
-  metadata:
-    name: config
-  apiServer:
-    extraArgs:
-      "service-account-signing-key-file": /etc/kubernetes/pki/sa.key
-      "service-account-key-file": /etc/kubernetes/pki/sa.pub
-      "service-account-issuer": api
-      "service-account-api-audiences": api,vault,factors
-  
diff --git a/test/e2e/kind-config-v1.19.yaml b/test/e2e/kind-config-v1.19.yaml
deleted file mode 120000
index 56770ea49b2..00000000000
--- a/test/e2e/kind-config-v1.19.yaml
+++ /dev/null
@@ -1 +0,0 @@
-kind-config-v1.18.yaml
\ No newline at end of file
diff --git a/test/e2e/kind-config.yaml b/test/e2e/kind-config.yaml
index 9a6033caff9..8251489dd54 100644
--- a/test/e2e/kind-config.yaml
+++ b/test/e2e/kind-config.yaml
@@ -14,4 +14,17 @@
 
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+  - role: control-plane
+kubeadmConfigPatches:
+  - |
+    kind: ClusterConfiguration
+    metadata:
+      name: config
+    apiServer:
+      extraArgs:
+        "service-account-signing-key-file": /etc/kubernetes/pki/sa.key
+        "service-account-key-file": /etc/kubernetes/pki/sa.pub
+        "service-account-issuer": api
+        "service-account-api-audiences": api,vault,factors