Merge branch 'haproxytech:master' into 703

Author: phihos

.aspell.yml

@@ -37,3 +37,6 @@ allowed:
   - cfg
   - optim
   - prometheus
+  - configmaps
+  - namespace
+  - namespaces

.github/workflows/actions.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: commit-policy
-        uses: docker://ghcr.io/haproxytech/commit-check:5.0.4
+        uses: docker://ghcr.io/haproxytech/commit-check:5.1.1
         env:
           API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   generate:
@@ -128,7 +128,7 @@ jobs:
   e2e:
     strategy:
       matrix:
-        k8s-version: ["v1.32.0"]
+        k8s-version: ["v1.32.2"]
     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.24.0
+          version: v0.27.0
       - name: Setup
         run: CI_ENV=github deploy/tests/create.sh
       - name: Run parallel e2e tests

.gitignore

@@ -7,3 +7,4 @@ dist/
 bin/golangci-lint
 bin/check-commit
 .local/*
+__debug_bin*

.gitlab-ci.yml

@@ -9,11 +9,11 @@ stages:
   - e2e_k8s_32
   - e2e_crd_versions
 variables:
-  KIND: v0.26.0
+  KIND: v0.27.0
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
   GO_VERSION: "1.24"
-  DOCKER_VERSION: "26.0"
+  DOCKER_VERSION: "27.0"
 diff:
   stage: diff
   rules:
@@ -93,7 +93,7 @@ commit-policy:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   image:
-    name: $CI_REGISTRY_GO/commit-check:5.0.2
+    name: $CI_REGISTRY_GO/commit-check:5.1.1
     entrypoint: [""]
   tags:
     - go
@@ -175,6 +175,8 @@ docker-build:
     #- docker image tag $CI_REGISTRY_GO/golang:$GO_VERSION-alpine golang:$GO_VERSION-alpine
     - docker pull -q $CI_REGISTRY_GO/haproxytech/http-echo:latest
     - docker image tag $CI_REGISTRY_GO/haproxytech/http-echo:latest haproxytech/http-echo:latest
+    - docker pull -q $CI_REGISTRY_GO/haproxytech/proxy-protocol:latest
+    - 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
@@ -208,7 +210,7 @@ e2e_k8s_30:
   stage: e2e_k8s_30
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.30.8
+    K8S_VERSION: v1.30.10
     KUBEADM_VER: v1beta3
     KUBECTL: v1.30.4
   extends: .kind_deployment_schedules
@@ -218,7 +220,7 @@ e2e_k8s_31:
   stage: e2e_k8s_31
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.31.4
+    K8S_VERSION: v1.31.6
     KUBEADM_VER: v1beta3
     KUBECTL: v1.31.0
   extends: .kind_deployment_schedules
@@ -228,7 +230,7 @@ e2e_crd_v1:
   stage: e2e_crd_versions
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.32.0
+    K8S_VERSION: v1.32.2
     KUBEADM_VER: v1beta3
     KUBECTL: v1.31.0
     CRD_VERSION: v1
@@ -239,7 +241,7 @@ e2e_k8s_32:
   stage: e2e_k8s_32
   needs: ["docker-build"]
   variables:
-    K8S_VERSION: v1.32.0
+    K8S_VERSION: v1.32.2
     KUBEADM_VER: v1beta3
     KUBECTL: v1.31.0
   extends: .kind_deployment

crs/code-generator.sh

@@ -102,3 +102,9 @@ echo "Controller-gen: " ${CONTROLLER_GEN_VERSION}
 controller-gen crd paths=./crs/api/ingress/v3/...  output:crd:dir=./crs/definition
 # remove code-gen annotation (dependabot fails)
 find ${CR_DIR}/definition -type f -name '*.yaml' -exec sed -i '/controller-gen.kubebuilder.io\/version/d' {} +
+
+
+# # Removal of some fields from the CRDs
+# # For example, for now we remove servers from the backend CRD v3
+echo "Removing fields from the generated CRDs"
+sh crs/remove-fields-from-crds.sh