From be11287e5eb1bfd0b1b0e83fbff920bb94f144c0 Mon Sep 17 00:00:00 2001
From: Zlatko Bratkovic <zbratkovic@haproxy.com>
Date: Mon, 23 Sep 2024 15:32:39 +0200
Subject: [PATCH] TEST/MEDIUM: ci: add k8s 1.31 version

---
 .github/workflows/actions.yml |  4 ++--
 .gitlab-ci.yml                | 24 ++++++++++++------------
 deploy/tests/kind-config.yaml |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 5141ea34..09b47b20 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -128,7 +128,7 @@ jobs:
   e2e:
     strategy:
       matrix:
-        k8s-version: ["v1.30.0"]
+        k8s-version: ["v1.31.0"]
     needs: ["build"]
     runs-on: ubuntu-latest
     steps:
@@ -152,7 +152,7 @@ jobs:
           name: dev
           config: deploy/tests/kind-config.yaml
           image: kindest/node:${{ matrix.k8s-version }}
-          version: v0.23.0
+          version: v0.24.0
       - name: Setup
         run: CI_ENV=github deploy/tests/create.sh
       - name: Run parallel e2e tests
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 134feb51..8af3aaa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
   - e2e_k8s_29
   - e2e_k8s_30
 variables:
-  KIND: v0.23.0
+  KIND: v0.24.0
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
   GO_VERSION: "1.23"
@@ -206,27 +206,27 @@ docker-build:
   rules:
    - if: $CI_PIPELINE_SOURCE == "schedule"
   allow_failure: true
-e2e_k8s_28:
-  stage: e2e_k8s_28
+e2e_k8s_29:
+  stage: e2e_k8s_29
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.28.6
+    K8S_VERSION: v1.29.8
     KUBEADM_VER: v1beta3
-    KUBECTL: v1.28.0
+    KUBECTL: v1.29.8
   extends: .kind_deployment_schedules
-e2e_k8s_29:
-  stage: e2e_k8s_29
+e2e_k8s_30:
+  stage: e2e_k8s_30
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.29.1
+    K8S_VERSION: v1.30.4
     KUBEADM_VER: v1beta3
-    KUBECTL: v1.29.0
+    KUBECTL: v1.30.4
   extends: .kind_deployment_schedules
-e2e_k8s_30:
+e2e_k8s_31:
   stage: e2e_k8s_30
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.30.0
+    K8S_VERSION: v1.31.0
     KUBEADM_VER: v1beta3
-    KUBECTL: v1.30.0
+    KUBECTL: v1.31.0
   extends: .kind_deployment
diff --git a/deploy/tests/kind-config.yaml b/deploy/tests/kind-config.yaml
index 9dbcfdb6..c57c7cd0 100644
--- a/deploy/tests/kind-config.yaml
+++ b/deploy/tests/kind-config.yaml
@@ -6,7 +6,7 @@ networking:
 kind: Cluster
 nodes:
   - role: control-plane
-    image: kindest/node:v1.30.0
+    image: kindest/node:v1.31.0
     extraPortMappings:
       - hostPort: 30080
         containerPort: 30080