Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 >>
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .circleci/src/workflows/build-and-test-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .circleci/src/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions bin/ingress_nginx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down