chore(ci): add ingress-nginx 1.13.3 and 1.12.7

Author: dmehala

.circleci/config.yml

@@ -411,8 +411,8 @@ workflows:
                             - amd64
                             - arm64
                         version:
-                            - 1.12.6
-                            - 1.13.2
+                            - 1.12.7
+                            - 1.13.3
                 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.2
-                            - 1.12.6
+                            - 1.13.3
+                            - 1.12.7
                 name: test ingress-nginx-<< matrix.nginx-version >> on << matrix.arch >>
                 requires:
                     - build ingress-nginx-<< matrix.nginx-version >> on << matrix.arch >>
@@ -518,9 +518,11 @@ workflows:
                             - amd64
                             - arm64
                         version:
+                            - 1.13.3
                             - 1.13.2
                             - 1.13.1
                             - 1.13.0
+                            - 1.12.7
                             - 1.12.6
                             - 1.12.5
                             - 1.12.4

.circleci/src/workflows/build-and-test-all.yml

@@ -14,9 +14,11 @@
             - 'amd64'
             - 'arm64'
             version:
+            - 1.13.3
             - 1.13.2
             - 1.13.1
             - 1.13.0
+            - 1.12.7
             - 1.12.6
             - 1.12.5
             - 1.12.4

.circleci/src/workflows/build-and-test.yml

@@ -47,8 +47,8 @@ jobs:
         - 'amd64'
         - 'arm64'
         version:
-        - 1.12.6
-        - 1.13.2
+        - 1.12.7
+        - 1.13.3
 - 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.2
-        - 1.12.6
+        - 1.13.3
+        - 1.12.7
 - system_tests:
     name: Run system tests
     requires:

bin/ingress_nginx.py

@@ -34,9 +34,11 @@
 def get_underlying_nginx_version(controller_version: str) -> str:
     # Map an ingress-nginx version to an NGINX version
     mapping = {
+        "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.7": "1.25.5",
         "v1.12.6": "1.25.5",
         "v1.12.5": "1.25.5",
         "v1.12.4": "1.25.5",
@@ -89,9 +91,11 @@ def clone_nginx(version: str, out_dir: str) -> str:
 
 def get_patch_directory(version: str, ingress_rootdir: str) -> str:
     mapping = {
+        "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.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",
         "v1.12.4": f"{ingress_rootdir}/images/nginx/rootfs/patches",
@@ -167,8 +171,9 @@ def prepare(args) -> int:
 
         nginx_src_dir = clone_nginx(nginx_version, args.output_dir)
 
-        patches_path = get_patch_directory(args.ingress_nginx_version,
-                                           ingress_nginx_path)
+        patches_path = get_patch_directory(
+            args.ingress_nginx_version, ingress_nginx_path
+        )
         if patches_path and os.path.exists(patches_path):
             patch_nginx(nginx_src_dir, patches_path)
 
@@ -193,45 +198,40 @@ def create_multiarch_images(tag_map: dict[str, typing.Any]) -> None:
 
 
 def main() -> int:
-    parser = argparse.ArgumentParser(
-        description="Script managing ingress-nginx")
+    parser = argparse.ArgumentParser(description="Script managing ingress-nginx")
     subparsers = parser.add_subparsers()
 
     # prepare subcommand
     prepare_parser = subparsers.add_parser(
         "prepare",
-        help=
-        "Prepare an NGINX source directory to be compatible with a specified ingress-nginx version",
+        help="Prepare an NGINX source directory to be compatible with a specified ingress-nginx version",
     )
     prepare_parser.set_defaults(func=prepare)
     prepare_parser.add_argument(
         "--ingress-nginx-version",
         metavar="INGRESS_NGINX_VERSION",
-        help=
-        "Specify the ingress-nginx version for compatibility (e.g., v1.10.3).",
+        help="Specify the ingress-nginx version for compatibility (e.g., v1.10.3).",
         required=True,
     )
     prepare_parser.add_argument(
         "--output-dir",
-        help=
-        f"Directory where the prepared NGINX source code will be saved. Defaults to the current working directory ({os.path.join(CWD, 'ingress-nginx')}).",
+        help=f"Directory where the prepared NGINX source code will be saved. Defaults to the current working directory ({os.path.join(CWD, 'ingress-nginx')}).",
         default=os.path.join(CWD, "ingress-nginx"),
     )
     prepare_parser.add_argument(
         "--dry-run",
         action="store_true",
-        help=
-        "Simulate the process without making any changes. Useful for testing what will happen.",
+        help="Simulate the process without making any changes. Useful for testing what will happen.",
     )
 
     # build-init-container subcommand
     build_init_container_parser = subparsers.add_parser(
-        "build-init-container", help="Build init-container for ingress-nginx")
+        "build-init-container", help="Build init-container for ingress-nginx"
+    )
     build_init_container_parser.set_defaults(func=build_init_container)
     build_init_container_parser.add_argument(
-        "--image_name",
-        help="Init-container docker tag name",
-        default="ingress-nginx")
+        "--image_name", help="Init-container docker tag name", default="ingress-nginx"
+    )
     build_init_container_parser.add_argument(
         "--module-path",
         help="Location of the module to package and publish",