From f6ad5aee2d6cb5b383d52a8fb67964b45bd8f6d4 Mon Sep 17 00:00:00 2001
From: Saba Orkoshneli <47318592+SabaOrk@users.noreply.github.com>
Date: Sat, 14 Jun 2025 16:59:49 +0400
Subject: [PATCH 1/2] remove /usr/local/bin/dataplaneapi-v2 &
 /usr/bin/dataplaneapi-v2 from Dockerfile

---
 build/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/Dockerfile b/build/Dockerfile
index b9535eff..c15974d9 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -43,6 +43,7 @@ COPY /fs /
 
 RUN apk --no-cache add socat openssl util-linux htop tzdata curl libcap && \
     rm -f /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi /etc/haproxy/dataplaneapi.yml && \
+    rm -f /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
     chgrp -R haproxy /usr/local/etc/haproxy /run /var && \
     chmod -R ug+rwx /usr/local/etc/haproxy /run /var && \
     setcap 'cap_net_bind_service=+ep' /usr/local/sbin/haproxy && \

From 058b7a98cb232ffec96b4f5c37bbf8e835048918 Mon Sep 17 00:00:00 2001
From: Zlatko Bratkovic <zbratkovic@haproxy.com>
Date: Thu, 29 May 2025 15:39:24 +0200
Subject: [PATCH 2/2] CLEANUP/MINOR: remove /usr/local/bin/dataplaneapi-v2 &
 /usr/bin/dataplaneapi-v2 from Dockerfile

---
 .github/workflows/actions.yml |  6 +++---
 .gitlab-ci.yml                | 22 +++++++++++-----------
 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 7f3df682..dac5a5cd 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -128,7 +128,7 @@ jobs:
   e2e:
     strategy:
       matrix:
-        k8s-version: ["v1.32.2"]
+        k8s-version: ["v1.33.1"]
     needs: ["build"]
     runs-on: ubuntu-latest
     steps:
@@ -147,12 +147,12 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
-      - uses: engineerd/setup-kind@v0.5.0
+      - uses: engineerd/setup-kind@v0.6.2
         with:
           name: dev
           config: deploy/tests/kind-config.yaml
           image: kindest/node:${{ matrix.k8s-version }}
-          version: v0.27.0
+          version: v0.29.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 fe7be954..b04b29cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,11 @@ stages:
   - e2e_k8s_32
   - e2e_crd_versions
 variables:
-  KIND: v0.27.0
+  KIND: v0.29.0
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
   GO_VERSION: "1.24"
-  DOCKER_VERSION: "27.0"
+  DOCKER_VERSION: "28.1"
 diff:
   stage: diff
   rules:
@@ -179,7 +179,7 @@ docker-build:
     - docker image tag $CI_REGISTRY_GO/haproxytech/proxy-protocol:latest haproxytech/proxy-protocol:latest
     - wget -nv -O /usr/local/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND}/kind-linux-amd64
     - chmod +x /usr/local/bin/kind
-    - wget -nv -O /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL}/bin/linux/amd64/kubectl
+    - wget -nv -O /usr/local/bin/kubectl https://dl.k8s.io/release/${KUBECTL}/bin/linux/amd64/kubectl
     - chmod +x /usr/local/bin/kubectl
     - sed -i "s/K8S_VERSION/$K8S_VERSION/g" ".gitlab/kind-config.yaml"
     - sed -i "s/KUBEADM_VER/$KUBEADM_VER/g" ".gitlab/kind-config.yaml"
@@ -210,9 +210,9 @@ e2e_k8s_30:
   stage: e2e_k8s_30
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.30.10
+    K8S_VERSION: v1.31.9
     KUBEADM_VER: v1beta3
-    KUBECTL: v1.30.4
+    KUBECTL: v1.31.0
   extends: .kind_deployment_schedules
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == 'weekly' &&  $SCHEDULE_DAY == 'monday'
@@ -220,9 +220,9 @@ e2e_k8s_31:
   stage: e2e_k8s_31
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.31.6
+    K8S_VERSION: v1.32.5
     KUBEADM_VER: v1beta3
-    KUBECTL: v1.31.0
+    KUBECTL: v1.32.0
   extends: .kind_deployment_schedules
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == 'weekly' &&  $SCHEDULE_DAY == 'tuesday'
@@ -230,9 +230,9 @@ e2e_crd_v1:
   stage: e2e_crd_versions
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.32.2
+    K8S_VERSION: v1.33.1
     KUBEADM_VER: v1beta3
-    KUBECTL: v1.31.0
+    KUBECTL: v1.33.1
     CRD_VERSION: v1
   extends: .kind_deployment_schedules
   rules:
@@ -241,7 +241,7 @@ e2e_k8s_32:
   stage: e2e_k8s_32
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.32.2
+    K8S_VERSION: v1.33.1
     KUBEADM_VER: v1beta3
-    KUBECTL: v1.31.0
+    KUBECTL: v1.33.1
   extends: .kind_deployment
diff --git a/deploy/tests/kind-config.yaml b/deploy/tests/kind-config.yaml
index 4c55dd0c..872b7d66 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.32.2
+    image: kindest/node:v1.33.1
     extraPortMappings:
       - hostPort: 30080
         containerPort: 30080