From bcd28b832f7c98de86c2ce1b69f5802868dcb81d Mon Sep 17 00:00:00 2001
From: Damien Mehala <damien.mehala@datadoghq.com>
Date: Mon, 3 Nov 2025 22:09:41 -0400
Subject: [PATCH] chore(ci): build ingress-nginx v1.14.0/v1.13.4/v1.12.8

---
 .circleci/config.yml                           | 14 ++++++++++----
 .circleci/src/workflows/build-and-test-all.yml |  6 ++++++
 .circleci/src/workflows/build-and-test.yml     |  8 ++++----
 bin/ingress_nginx.py                           |  6 ++++++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f4a674d5..213bc6da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -411,8 +411,8 @@ workflows:
                             - amd64
                             - arm64
                         version:
-                            - 1.12.7
-                            - 1.13.3
+                            - 1.13.4
+                            - 1.14.0
                 name: build ingress-nginx-<< matrix.version >> on << matrix.arch >>
             - coverage:
                 name: Coverage on 1.27.0 with WAF ON
@@ -491,8 +491,8 @@ workflows:
                         base-image:
                             - registry.k8s.io/ingress-nginx/controller
                         nginx-version:
-                            - 1.13.3
-                            - 1.12.7
+                            - 1.13.4
+                            - 1.14.0
                 name: test ingress-nginx-<< matrix.nginx-version >> on << matrix.arch >>
                 requires:
                     - build ingress-nginx-<< matrix.nginx-version >> on << matrix.arch >>
@@ -518,10 +518,13 @@ workflows:
                             - amd64
                             - arm64
                         version:
+                            - 1.14.0
+                            - 1.13.4
                             - 1.13.3
                             - 1.13.2
                             - 1.13.1
                             - 1.13.0
+                            - 1.12.8
                             - 1.12.7
                             - 1.12.6
                             - 1.12.5
@@ -560,9 +563,12 @@ workflows:
                         base-image:
                             - registry.k8s.io/ingress-nginx/controller
                         nginx-version:
+                            - 1.14.0
+                            - 1.13.3
                             - 1.13.2
                             - 1.13.1
                             - 1.13.0
+                            - 1.12.7
                             - 1.12.6
                             - 1.12.5
                             - 1.12.4
diff --git a/.circleci/src/workflows/build-and-test-all.yml b/.circleci/src/workflows/build-and-test-all.yml
index c952972c..ec6e4070 100644
--- a/.circleci/src/workflows/build-and-test-all.yml
+++ b/.circleci/src/workflows/build-and-test-all.yml
@@ -14,10 +14,13 @@
             - 'amd64'
             - 'arm64'
             version:
+            - 1.14.0
+            - 1.13.4
             - 1.13.3
             - 1.13.2
             - 1.13.1
             - 1.13.0
+            - 1.12.8
             - 1.12.7
             - 1.12.6
             - 1.12.5
@@ -58,9 +61,12 @@
             base-image:
             - registry.k8s.io/ingress-nginx/controller
             nginx-version:
+            - 1.14.0
+            - 1.13.3
             - 1.13.2
             - 1.13.1
             - 1.13.0
+            - 1.12.7
             - 1.12.6
             - 1.12.5
             - 1.12.4
diff --git a/.circleci/src/workflows/build-and-test.yml b/.circleci/src/workflows/build-and-test.yml
index dbf5b730..b01c8484 100644
--- a/.circleci/src/workflows/build-and-test.yml
+++ b/.circleci/src/workflows/build-and-test.yml
@@ -47,8 +47,8 @@ jobs:
         - 'amd64'
         - 'arm64'
         version:
-        - 1.12.7
-        - 1.13.3
+        - 1.13.4
+        - 1.14.0
 - coverage:
     name: Coverage on 1.27.0 with WAF ON
 - test:
@@ -133,8 +133,8 @@ jobs:
         base-image:
         - registry.k8s.io/ingress-nginx/controller
         nginx-version:
-        - 1.13.3
-        - 1.12.7
+        - 1.13.4
+        - 1.14.0
 - system_tests:
     name: Run system tests
     requires:
diff --git a/bin/ingress_nginx.py b/bin/ingress_nginx.py
index 8899c68f..90e5cfae 100755
--- a/bin/ingress_nginx.py
+++ b/bin/ingress_nginx.py
@@ -34,10 +34,13 @@
 def get_underlying_nginx_version(controller_version: str) -> str:
     # Map an ingress-nginx version to an NGINX version
     mapping = {
+        "v1.14.0": "1.27.1",
+        "v1.13.4": "1.27.1",
         "v1.13.3": "1.27.1",
         "v1.13.2": "1.27.1",
         "v1.13.1": "1.27.1",
         "v1.13.0": "1.27.1",
+        "v1.12.8": "1.25.5",
         "v1.12.7": "1.25.5",
         "v1.12.6": "1.25.5",
         "v1.12.5": "1.25.5",
@@ -91,10 +94,13 @@ def clone_nginx(version: str, out_dir: str) -> str:
 
 def get_patch_directory(version: str, ingress_rootdir: str) -> str:
     mapping = {
+        "v1.14.0": f"{ingress_rootdir}/images/nginx/rootfs/patches",
+        "v1.13.4": f"{ingress_rootdir}/images/nginx/rootfs/patches",
         "v1.13.3": f"{ingress_rootdir}/images/nginx/rootfs/patches",
         "v1.13.2": f"{ingress_rootdir}/images/nginx/rootfs/patches",
         "v1.13.1": f"{ingress_rootdir}/images/nginx/rootfs/patches",
         "v1.13.0": f"{ingress_rootdir}/images/nginx/rootfs/patches",
+        "v1.12.8": f"{ingress_rootdir}/images/nginx/rootfs/patches",
         "v1.12.7": f"{ingress_rootdir}/images/nginx/rootfs/patches",
         "v1.12.6": f"{ingress_rootdir}/images/nginx/rootfs/patches",
         "v1.12.5": f"{ingress_rootdir}/images/nginx/rootfs/patches",