From b1ddcda64cbe9037a761fdff1dd16dd7b643b572 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jun 2025 22:04:37 -0700
Subject: [PATCH 001/361] Bump ossf/scorecard-action from 2.4.1 to 2.4.2 in the
actions group (#13449)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/scorecards.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index aad8cfe4d8..0d1b26b297 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -32,7 +32,7 @@ jobs:
persist-credentials: false
- name: "Run analysis"
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+ uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
with:
results_file: results.sarif
results_format: sarif
From a71de6b0f8223f40adae4658013275ea76d4bd49 Mon Sep 17 00:00:00 2001
From: Timon Engelke <25013222+timonegk@users.noreply.github.com>
Date: Tue, 3 Jun 2025 14:48:39 +0200
Subject: [PATCH 002/361] Docs: Add OpenTelemetry defaults. (#13454)
Signed-off-by: Timon Engelke
---
.../third-party-addons/opentelemetry.md | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/docs/user-guide/third-party-addons/opentelemetry.md b/docs/user-guide/third-party-addons/opentelemetry.md
index ed062e0faf..7ca8c8aaca 100644
--- a/docs/user-guide/third-party-addons/opentelemetry.md
+++ b/docs/user-guide/third-party-addons/opentelemetry.md
@@ -51,7 +51,7 @@ Other optional configuration options:
# specifies the name to use for the server span
opentelemetry-operation-name
-# sets whether or not to trust incoming telemetry spans
+# sets whether or not to trust incoming telemetry spans, Default: true
opentelemetry-trust-incoming-span
# specifies the port to use when uploading traces, Default: 4317
@@ -60,26 +60,23 @@ otlp-collector-port
# specifies the service name to use for any traces created, Default: nginx
otel-service-name
-# The maximum queue size. After the size is reached data are dropped.
+# The maximum queue size. After the size is reached data are dropped, Default: 2048
otel-max-queuesize
-# The delay interval in milliseconds between two consecutive exports.
+# The delay interval in milliseconds between two consecutive exports, Default: 5000
otel-schedule-delay-millis
-# How long the export can run before it is cancelled.
-otel-schedule-delay-millis
-
-# The maximum batch size of every export. It must be smaller or equal to maxQueueSize.
+# The maximum batch size of every export. It must be smaller or equal to maxQueueSize, Default: 512
otel-max-export-batch-size
# specifies sample rate for any traces created, Default: 0.01
otel-sampler-ratio
# specifies the sampler to be used when sampling traces.
-# The available samplers are: AlwaysOn, AlwaysOff, TraceIdRatioBased, Default: AlwaysOff
+# The available samplers are: AlwaysOn, AlwaysOff, TraceIdRatioBased, Default: AlwaysOn
otel-sampler
-# Uses sampler implementation which by default will take a sample if parent Activity is sampled, Default: false
+# Uses sampler implementation which by default will take a sample if parent Activity is sampled, Default: true
otel-sampler-parent-based
```
From 23df1c01598933007131bf2981985a90971ea11c Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Tue, 3 Jun 2025 20:36:38 +0200
Subject: [PATCH 003/361] Tests & Docs: Bump images. (#13457)
---
docs/examples/canary/README.md | 4 ++--
.../custom-errors/custom-default-backend.helm.values.yaml | 2 +-
.../customization/custom-errors/custom-default-backend.yaml | 2 +-
.../customization/external-auth-headers/echo-service.yaml | 2 +-
test/e2e/HTTPBUN_IMAGE | 2 +-
test/e2e/framework/deployment.go | 2 +-
test/e2e/framework/fastcgi_helloserver.go | 2 +-
test/e2e/settings/ocsp/ocsp.go | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/examples/canary/README.md b/docs/examples/canary/README.md
index a68d647484..cf6b32ed4f 100644
--- a/docs/examples/canary/README.md
+++ b/docs/examples/canary/README.md
@@ -31,7 +31,7 @@ spec:
spec:
containers:
- name: production
- image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.3@sha256:77e8f7aa7e5651409cbe4ca38430e61828873c7df325e6f83c7345e34011f6b2
+ image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.4@sha256:0e7cf544a27bfdc9ed7f33cad2b6bc25cb6ae49f8bbdaa329dab3f31c65c44f6
ports:
- containerPort: 80
env:
@@ -97,7 +97,7 @@ spec:
spec:
containers:
- name: canary
- image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.3@sha256:77e8f7aa7e5651409cbe4ca38430e61828873c7df325e6f83c7345e34011f6b2
+ image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.4@sha256:0e7cf544a27bfdc9ed7f33cad2b6bc25cb6ae49f8bbdaa329dab3f31c65c44f6
ports:
- containerPort: 80
env:
diff --git a/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml b/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml
index 52eed6709f..6debe45015 100644
--- a/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml
+++ b/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml
@@ -6,7 +6,7 @@ defaultBackend:
image:
registry: registry.k8s.io
image: ingress-nginx/custom-error-pages
- tag: v1.1.3@sha256:5aeaf5d01470bcc7d73b8846458b00dbc62d54277cd110cec8f28e663c11f93e
+ tag: v1.1.4@sha256:9151d8114e45a2d386c30e04cb17dd2c62c862f14d49b513ec083ec25cfced20
extraVolumes:
- name: custom-error-pages
configMap:
diff --git a/docs/examples/customization/custom-errors/custom-default-backend.yaml b/docs/examples/customization/custom-errors/custom-default-backend.yaml
index 64da6e409a..91c14baf36 100644
--- a/docs/examples/customization/custom-errors/custom-default-backend.yaml
+++ b/docs/examples/customization/custom-errors/custom-default-backend.yaml
@@ -36,7 +36,7 @@ spec:
spec:
containers:
- name: nginx-error-server
- image: registry.k8s.io/ingress-nginx/custom-error-pages:v1.1.3@sha256:5aeaf5d01470bcc7d73b8846458b00dbc62d54277cd110cec8f28e663c11f93e
+ image: registry.k8s.io/ingress-nginx/custom-error-pages:v1.1.4@sha256:9151d8114e45a2d386c30e04cb17dd2c62c862f14d49b513ec083ec25cfced20
ports:
- containerPort: 8080
# Setting the environment variable DEBUG we can see the headers sent
diff --git a/docs/examples/customization/external-auth-headers/echo-service.yaml b/docs/examples/customization/external-auth-headers/echo-service.yaml
index e17ff38516..69d3f0b81a 100644
--- a/docs/examples/customization/external-auth-headers/echo-service.yaml
+++ b/docs/examples/customization/external-auth-headers/echo-service.yaml
@@ -18,7 +18,7 @@ spec:
terminationGracePeriodSeconds: 60
containers:
- name: echo-service
- image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.3@sha256:77e8f7aa7e5651409cbe4ca38430e61828873c7df325e6f83c7345e34011f6b2
+ image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.4@sha256:0e7cf544a27bfdc9ed7f33cad2b6bc25cb6ae49f8bbdaa329dab3f31c65c44f6
ports:
- containerPort: 8080
resources:
diff --git a/test/e2e/HTTPBUN_IMAGE b/test/e2e/HTTPBUN_IMAGE
index 4dce0ea75b..24456c7951 100644
--- a/test/e2e/HTTPBUN_IMAGE
+++ b/test/e2e/HTTPBUN_IMAGE
@@ -1 +1 @@
-registry.k8s.io/ingress-nginx/httpbun:v1.1.3@sha256:768fa3a3732ee14d7ecd31b9dd6e24a6e2fc9f935359cf695098a0833b0d2c49
+registry.k8s.io/ingress-nginx/httpbun:v1.1.4@sha256:6f6e3de1dd889dd7e72751e01437bbfefd1e90079f36101c42fbac8ef094e0ae
diff --git a/test/e2e/framework/deployment.go b/test/e2e/framework/deployment.go
index f6ac6222bd..215f1a8cd4 100644
--- a/test/e2e/framework/deployment.go
+++ b/test/e2e/framework/deployment.go
@@ -47,7 +47,7 @@ const NIPService = "external-nip"
var HTTPBunImage = os.Getenv("HTTPBUN_IMAGE")
// EchoImage is the default image to be used by the echo service
-const EchoImage = "registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.3@sha256:77e8f7aa7e5651409cbe4ca38430e61828873c7df325e6f83c7345e34011f6b2" //#nosec G101
+const EchoImage = "registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.4@sha256:0e7cf544a27bfdc9ed7f33cad2b6bc25cb6ae49f8bbdaa329dab3f31c65c44f6" //#nosec G101
// TODO: change all Deployment functions to use these options
// in order to reduce complexity and have a unified API across the
diff --git a/test/e2e/framework/fastcgi_helloserver.go b/test/e2e/framework/fastcgi_helloserver.go
index 325810aeb3..9ba2f879a9 100644
--- a/test/e2e/framework/fastcgi_helloserver.go
+++ b/test/e2e/framework/fastcgi_helloserver.go
@@ -59,7 +59,7 @@ func (f *Framework) NewNewFastCGIHelloServerDeploymentWithReplicas(replicas int3
Containers: []corev1.Container{
{
Name: "fastcgi-helloserver",
- Image: "registry.k8s.io/ingress-nginx/fastcgi-helloserver:v1.1.3@sha256:c150b9db05d67312168ff7a07c0b6cbf39f0339a6adfef945f8d4c16fc4d588e",
+ Image: "registry.k8s.io/ingress-nginx/fastcgi-helloserver:v1.1.4@sha256:2547e6e6b1818e887fb2c9fdde8668aecfe720f39543435b5924bb823515b447",
Env: []corev1.EnvVar{},
Ports: []corev1.ContainerPort{
{
diff --git a/test/e2e/settings/ocsp/ocsp.go b/test/e2e/settings/ocsp/ocsp.go
index 06ca7284f8..099342c60b 100644
--- a/test/e2e/settings/ocsp/ocsp.go
+++ b/test/e2e/settings/ocsp/ocsp.go
@@ -297,7 +297,7 @@ func ocspserveDeployment(namespace string) (*appsv1.Deployment, *corev1.Service)
Containers: []corev1.Container{
{
Name: name,
- Image: "registry.k8s.io/ingress-nginx/cfssl:v1.1.3@sha256:68defb0ae012e3023e81c525958e5e19a0fac64841f17f488c798a2f582b67a5",
+ Image: "registry.k8s.io/ingress-nginx/cfssl:v1.1.4@sha256:56ae16e665fd8e24d3d23773f13d3724583a566e833713959cfe51d9323576e9",
Command: []string{
"/bin/bash",
"-c",
From 666f7d2aecb38e8503171b328afae83b668a6ad9 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Tue, 3 Jun 2025 22:06:44 +0200
Subject: [PATCH 004/361] Chart: Bump Kube Webhook CertGen. (#13458)
---
charts/ingress-nginx/README.md | 4 ++--
charts/ingress-nginx/values.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md
index c415c2b899..eaf8ae6c76 100644
--- a/charts/ingress-nginx/README.md
+++ b/charts/ingress-nginx/README.md
@@ -272,10 +272,10 @@ metadata:
| controller.admissionWebhooks.namespaceSelector | object | `{}` | |
| controller.admissionWebhooks.objectSelector | object | `{}` | |
| controller.admissionWebhooks.patch.enabled | bool | `true` | |
-| controller.admissionWebhooks.patch.image.digest | string | `"sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524"` | |
+| controller.admissionWebhooks.patch.image.digest | string | `"sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e"` | |
| controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` | |
| controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` | |
-| controller.admissionWebhooks.patch.image.tag | string | `"v1.5.3"` | |
+| controller.admissionWebhooks.patch.image.tag | string | `"v1.5.4"` | |
| controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
| controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
| controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 15152afd64..29153f8975 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -818,8 +818,8 @@ controller:
## for backwards compatibility consider setting the full image url via the repository value below
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
## repository:
- tag: v1.5.3
- digest: sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ tag: v1.5.4
+ digest: sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
pullPolicy: IfNotPresent
# -- Provide a priority class name to the webhook patching job
##
From e4b964bc970d5d16b7a1bce897a98c623fe4b3cd Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Wed, 4 Jun 2025 06:19:07 +0200
Subject: [PATCH 005/361] Images: Trigger controller build. (#13463)
---
TAG | 1 +
1 file changed, 1 insertion(+)
create mode 100644 TAG
diff --git a/TAG b/TAG
new file mode 100644
index 0000000000..ba2906d066
--- /dev/null
+++ b/TAG
@@ -0,0 +1 @@
+main
From b9d6e3fe23e216b23940b8a6a2501e51496f639e Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Thu, 5 Jun 2025 08:36:45 +0200
Subject: [PATCH 006/361] Release controller v1.12.3/v1.11.7 & chart
v4.12.3/v4.11.7. (#13470)
---
README.md | 2 +
changelog/controller-1.11.7.md | 53 +++++++++++++++++++
changelog/controller-1.12.3.md | 53 +++++++++++++++++++
charts/ingress-nginx/Chart.yaml | 6 +--
charts/ingress-nginx/README.md | 8 +--
.../changelog/helm-chart-4.11.7.md | 9 ++++
.../changelog/helm-chart-4.12.3.md | 9 ++++
charts/ingress-nginx/values.yaml | 6 +--
deploy/static/provider/aws/deploy.yaml | 50 ++++++++---------
.../aws/nlb-with-tls-termination/deploy.yaml | 50 ++++++++---------
deploy/static/provider/baremetal/deploy.yaml | 50 ++++++++---------
deploy/static/provider/cloud/deploy.yaml | 50 ++++++++---------
deploy/static/provider/do/deploy.yaml | 50 ++++++++---------
deploy/static/provider/exoscale/deploy.yaml | 50 ++++++++---------
deploy/static/provider/kind/deploy.yaml | 50 ++++++++---------
deploy/static/provider/oracle/deploy.yaml | 50 ++++++++---------
deploy/static/provider/scw/deploy.yaml | 50 ++++++++---------
docs/deploy/index.md | 20 +++----
18 files changed, 380 insertions(+), 236 deletions(-)
create mode 100644 changelog/controller-1.11.7.md
create mode 100644 changelog/controller-1.12.3.md
create mode 100644 charts/ingress-nginx/changelog/helm-chart-4.11.7.md
create mode 100644 charts/ingress-nginx/changelog/helm-chart-4.12.3.md
diff --git a/README.md b/README.md
index c4415824ed..b7c8b9e7c1 100644
--- a/README.md
+++ b/README.md
@@ -39,10 +39,12 @@ the versions listed. Ingress-Nginx versions **may** work on older versions, but
| Supported | Ingress-NGINX version | k8s supported version | Alpine Version | Nginx Version | Helm Chart Version |
| :-------: | --------------------- | ----------------------------- | -------------- | ------------- | ------------------ |
+| 🔄 | **v1.12.3** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.3 | 1.25.5 | 4.12.3 |
| 🔄 | **v1.12.2** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.3 | 1.25.5 | 4.12.2 |
| 🔄 | **v1.12.1** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.3 | 1.25.5 | 4.12.1 |
| 🔄 | **v1.12.0** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.0 | 1.25.5 | 4.12.0 |
| 🔄 | **v1.12.0-beta.0** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.20.3 | 1.25.5 | 4.12.0-beta.0 |
+| 🔄 | **v1.11.7** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.7 |
| 🔄 | **v1.11.6** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.6 |
| 🔄 | **v1.11.5** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.5 |
| 🔄 | **v1.11.4** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.0 | 1.25.5 | 4.11.4 |
diff --git a/changelog/controller-1.11.7.md b/changelog/controller-1.11.7.md
new file mode 100644
index 0000000000..db17634d10
--- /dev/null
+++ b/changelog/controller-1.11.7.md
@@ -0,0 +1,53 @@
+# Changelog
+
+### controller-v1.11.7
+
+Images:
+
+* registry.k8s.io/ingress-nginx/controller:v1.11.7@sha256:016a25cf89bf7f930869ccd7cb3dd4acbe106cd4da1419804951ef9c8636f053
+* registry.k8s.io/ingress-nginx/controller-chroot:v1.11.7@sha256:62d251b0e402fd4b3b06196c9a8c5639f9eba06999499851d1b449fe4be562b1
+
+### All changes:
+
+* Images: Trigger controller build. (#13465)
+* Chart: Bump Kube Webhook CertGen. (#13462)
+* Tests & Docs: Bump images. (#13461)
+* Docs: Add OpenTelemetry defaults. (#13456)
+* Images: Trigger other builds (2/2). (#13443)
+* Images: Trigger other builds (1/2). (#13440)
+* Tests: Bump Test Runner to v1.3.5. (#13437)
+* Images: Trigger Test Runner build. (#13433)
+* Lua: Fix `ExternalName` services without endpoints. (#13430)
+* Images: Bump NGINX to v0.3.5. (#13428)
+* Images: Trigger NGINX build. (#13425)
+* Go: Update dependencies. (#13421)
+* Images: Build Go gRPC Greeter Server from scratch. (#13410)
+* Chart: Remove validation for removed API. (#13408)
+* Go: Update dependencies. (#13400)
+* Images: Bump GCB Docker GCloud to v20250513-9264efb079. (#13397)
+* CI: Update Kubernetes. (#13396)
+* Fix 🐛: Markdown requires nested content inside a list item to be indented (#13391)
+* Tests: Bump Test Runner to v1.3.4. (#13356)
+* Images: Trigger Test Runner build. (#13349)
+* Go: Bump to v1.24.3. (#13343)
+* Images: Bump NGINX to v0.3.4. (#13347)
+* Images: Trigger NGINX build. (#13340)
+* Go: Update dependencies. (#13328)
+* Go: Update dependencies. (#13323)
+
+### Dependency updates:
+
+* Bump ossf/scorecard-action from 2.4.1 to 2.4.2 in the actions group (#13452)
+* Bump the go group across 2 directories with 1 update (#13418)
+* Bump sigs.k8s.io/controller-runtime from 0.20.4 to 0.21.0 (#13416)
+* Bump the actions group with 3 updates (#13387)
+* Bump github.com/prometheus/common from 0.63.0 to 0.64.0 (#13385)
+* Bump the go group across 4 directories with 10 updates (#13383)
+* Bump golang.org/x/crypto from 0.37.0 to 0.38.0 (#13369)
+* Bump the actions group with 2 updates (#13368)
+* Bump golang.org/x/oauth2 from 0.29.0 to 0.30.0 (#13364)
+* Bump dario.cat/mergo from 1.0.1 to 1.0.2 in the go group across 1 directory (#13366)
+* Bump github/codeql-action from 3.28.16 to 3.28.17 in the actions group (#13335)
+* Bump golangci/golangci-lint-action from 7.0.0 to 8.0.0 (#13333)
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.11.6...controller-v1.11.7
diff --git a/changelog/controller-1.12.3.md b/changelog/controller-1.12.3.md
new file mode 100644
index 0000000000..2e962bfdfa
--- /dev/null
+++ b/changelog/controller-1.12.3.md
@@ -0,0 +1,53 @@
+# Changelog
+
+### controller-v1.12.3
+
+Images:
+
+* registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+* registry.k8s.io/ingress-nginx/controller-chroot:v1.12.3@sha256:d830fba93e9e0f5ef1462f5fe8a7cd7b167178b79e6c10c041c7da19f1ac66ab
+
+### All changes:
+
+* Images: Trigger controller build. (#13464)
+* Chart: Bump Kube Webhook CertGen. (#13460)
+* Tests & Docs: Bump images. (#13459)
+* Docs: Add OpenTelemetry defaults. (#13455)
+* Images: Trigger other builds (2/2). (#13442)
+* Images: Trigger other builds (1/2). (#13439)
+* Tests: Bump Test Runner to v1.3.5. (#13436)
+* Images: Trigger Test Runner build. (#13432)
+* Lua: Fix `ExternalName` services without endpoints. (#13429)
+* Images: Bump NGINX to v1.2.5. (#13427)
+* Images: Trigger NGINX build. (#13424)
+* Go: Update dependencies. (#13420)
+* Images: Build Go gRPC Greeter Server from scratch. (#13409)
+* Chart: Remove validation for removed API. (#13407)
+* Go: Update dependencies. (#13399)
+* Images: Bump GCB Docker GCloud to v20250513-9264efb079. (#13395)
+* CI: Update Kubernetes. (#13394)
+* Fix 🐛: Markdown requires nested content inside a list item to be indented (#13390)
+* Tests: Bump Test Runner to v1.3.4. (#13355)
+* Images: Trigger Test Runner build. (#13350)
+* Go: Bump to v1.24.3. (#13342)
+* Images: Bump NGINX to v1.2.4. (#13346)
+* Images: Trigger NGINX build. (#13339)
+* Go: Update dependencies. (#13327)
+* Go: Update dependencies. (#13322)
+
+### Dependency updates:
+
+* Bump ossf/scorecard-action from 2.4.1 to 2.4.2 in the actions group (#13451)
+* Bump the go group across 2 directories with 1 update (#13417)
+* Bump sigs.k8s.io/controller-runtime from 0.20.4 to 0.21.0 (#13415)
+* Bump the actions group with 3 updates (#13386)
+* Bump github.com/prometheus/common from 0.63.0 to 0.64.0 (#13384)
+* Bump the go group across 4 directories with 10 updates (#13382)
+* Bump golang.org/x/crypto from 0.37.0 to 0.38.0 (#13370)
+* Bump the actions group with 2 updates (#13367)
+* Bump golang.org/x/oauth2 from 0.29.0 to 0.30.0 (#13363)
+* Bump dario.cat/mergo from 1.0.1 to 1.0.2 in the go group across 1 directory (#13365)
+* Bump github/codeql-action from 3.28.16 to 3.28.17 in the actions group (#13336)
+* Bump golangci/golangci-lint-action from 7.0.0 to 8.0.0 (#13334)
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.12.2...controller-v1.12.3
diff --git a/charts/ingress-nginx/Chart.yaml b/charts/ingress-nginx/Chart.yaml
index 06faa41706..2c6d9aa6b2 100644
--- a/charts/ingress-nginx/Chart.yaml
+++ b/charts/ingress-nginx/Chart.yaml
@@ -1,9 +1,9 @@
annotations:
artifacthub.io/changes: |
- - Update Ingress-Nginx version controller-v1.12.2
+ - Update Ingress-Nginx version controller-v1.12.3
artifacthub.io/prerelease: "false"
apiVersion: v2
-appVersion: 1.12.2
+appVersion: 1.12.3
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
load balancer
home: https://github.com/kubernetes/ingress-nginx
@@ -20,4 +20,4 @@ maintainers:
name: ingress-nginx
sources:
- https://github.com/kubernetes/ingress-nginx
-version: 4.12.2
+version: 4.12.3
diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md
index eaf8ae6c76..14fe587c05 100644
--- a/charts/ingress-nginx/README.md
+++ b/charts/ingress-nginx/README.md
@@ -2,7 +2,7 @@
[ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
- 
+ 
To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
@@ -343,8 +343,8 @@ metadata:
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
| controller.image.allowPrivilegeEscalation | bool | `false` | |
| controller.image.chroot | bool | `false` | |
-| controller.image.digest | string | `"sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9"` | |
-| controller.image.digestChroot | string | `"sha256:a697e2bfa419768315250d079ccbbca45f6099c60057769702b912d20897a574"` | |
+| controller.image.digest | string | `"sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee"` | |
+| controller.image.digestChroot | string | `"sha256:d830fba93e9e0f5ef1462f5fe8a7cd7b167178b79e6c10c041c7da19f1ac66ab"` | |
| controller.image.image | string | `"ingress-nginx/controller"` | |
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
| controller.image.readOnlyRootFilesystem | bool | `false` | |
@@ -352,7 +352,7 @@ metadata:
| controller.image.runAsNonRoot | bool | `true` | |
| controller.image.runAsUser | int | `101` | This value must not be changed using the official image. uid=101(www-data) gid=82(www-data) groups=82(www-data) |
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
-| controller.image.tag | string | `"v1.12.2"` | |
+| controller.image.tag | string | `"v1.12.3"` | |
| controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
| controller.ingressClassResource | object | `{"aliases":[],"annotations":{},"controllerValue":"k8s.io/ingress-nginx","default":false,"enabled":true,"name":"nginx","parameters":{}}` | This section refers to the creation of the IngressClass resource. IngressClasses are immutable and cannot be changed after creation. We do not support namespaced IngressClasses, yet, so a ClusterRole and a ClusterRoleBinding is required. |
diff --git a/charts/ingress-nginx/changelog/helm-chart-4.11.7.md b/charts/ingress-nginx/changelog/helm-chart-4.11.7.md
new file mode 100644
index 0000000000..28f88c559d
--- /dev/null
+++ b/charts/ingress-nginx/changelog/helm-chart-4.11.7.md
@@ -0,0 +1,9 @@
+# Changelog
+
+This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
+
+### 4.11.7
+
+* Update Ingress-Nginx version controller-v1.11.7
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.6...helm-chart-4.11.7
diff --git a/charts/ingress-nginx/changelog/helm-chart-4.12.3.md b/charts/ingress-nginx/changelog/helm-chart-4.12.3.md
new file mode 100644
index 0000000000..83501691c8
--- /dev/null
+++ b/charts/ingress-nginx/changelog/helm-chart-4.12.3.md
@@ -0,0 +1,9 @@
+# Changelog
+
+This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
+
+### 4.12.3
+
+* Update Ingress-Nginx version controller-v1.12.3
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.12.2...helm-chart-4.12.3
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 29153f8975..1083527bcc 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -30,9 +30,9 @@ controller:
## for backwards compatibility consider setting the full image url via the repository value below
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
## repository:
- tag: "v1.12.2"
- digest: sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
- digestChroot: sha256:a697e2bfa419768315250d079ccbbca45f6099c60057769702b912d20897a574
+ tag: "v1.12.3"
+ digest: sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ digestChroot: sha256:d830fba93e9e0f5ef1462f5fe8a7cd7b167178b79e6c10c041c7da19f1ac66ab
pullPolicy: IfNotPresent
runAsNonRoot: true
# -- This value must not be changed using the official image.
diff --git a/deploy/static/provider/aws/deploy.yaml b/deploy/static/provider/aws/deploy.yaml
index e938124a0e..e34243fd40 100644
--- a/deploy/static/provider/aws/deploy.yaml
+++ b/deploy/static/provider/aws/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -344,7 +344,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -377,7 +377,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -400,7 +400,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -422,7 +422,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
spec:
containers:
- args:
@@ -446,7 +446,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.2@sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
+ image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -523,7 +523,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -534,7 +534,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
spec:
containers:
@@ -548,7 +548,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -566,6 +566,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: batch/v1
kind: Job
@@ -575,7 +576,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -586,7 +587,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
spec:
containers:
@@ -602,7 +603,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -620,6 +621,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
@@ -629,7 +631,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -642,7 +644,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
index 0a9e643729..a044aca4ee 100644
--- a/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
+++ b/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -335,7 +335,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -353,7 +353,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -386,7 +386,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -409,7 +409,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -431,7 +431,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
spec:
containers:
- args:
@@ -455,7 +455,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.2@sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
+ image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -535,7 +535,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -546,7 +546,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
spec:
containers:
@@ -560,7 +560,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -578,6 +578,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: batch/v1
kind: Job
@@ -587,7 +588,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -598,7 +599,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
spec:
containers:
@@ -614,7 +615,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -632,6 +633,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
@@ -641,7 +643,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -654,7 +656,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/baremetal/deploy.yaml b/deploy/static/provider/baremetal/deploy.yaml
index 71d9531d96..9ba97f72b3 100644
--- a/deploy/static/provider/baremetal/deploy.yaml
+++ b/deploy/static/provider/baremetal/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -340,7 +340,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -372,7 +372,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -395,7 +395,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -417,7 +417,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
spec:
containers:
- args:
@@ -440,7 +440,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.2@sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
+ image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -517,7 +517,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -528,7 +528,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
spec:
containers:
@@ -542,7 +542,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -560,6 +560,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: batch/v1
kind: Job
@@ -569,7 +570,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -580,7 +581,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
spec:
containers:
@@ -596,7 +597,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -614,6 +615,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
@@ -623,7 +625,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -636,7 +638,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/cloud/deploy.yaml b/deploy/static/provider/cloud/deploy.yaml
index 432a364f69..7d23319aa7 100644
--- a/deploy/static/provider/cloud/deploy.yaml
+++ b/deploy/static/provider/cloud/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -340,7 +340,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -373,7 +373,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -396,7 +396,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -418,7 +418,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
spec:
containers:
- args:
@@ -442,7 +442,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.2@sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
+ image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -519,7 +519,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -530,7 +530,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
spec:
containers:
@@ -544,7 +544,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -562,6 +562,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: batch/v1
kind: Job
@@ -571,7 +572,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -582,7 +583,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
spec:
containers:
@@ -598,7 +599,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -616,6 +617,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
@@ -625,7 +627,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -638,7 +640,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/do/deploy.yaml b/deploy/static/provider/do/deploy.yaml
index 6ed8688b9f..b4c5fc370d 100644
--- a/deploy/static/provider/do/deploy.yaml
+++ b/deploy/static/provider/do/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -329,7 +329,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -343,7 +343,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -376,7 +376,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -399,7 +399,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -421,7 +421,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
spec:
containers:
- args:
@@ -445,7 +445,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.2@sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
+ image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -522,7 +522,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -533,7 +533,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
spec:
containers:
@@ -547,7 +547,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -565,6 +565,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: batch/v1
kind: Job
@@ -574,7 +575,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -585,7 +586,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
spec:
containers:
@@ -601,7 +602,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -619,6 +620,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
@@ -628,7 +630,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -641,7 +643,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/exoscale/deploy.yaml b/deploy/static/provider/exoscale/deploy.yaml
index 07d9c96bc1..2005fb0785 100644
--- a/deploy/static/provider/exoscale/deploy.yaml
+++ b/deploy/static/provider/exoscale/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -349,7 +349,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -382,7 +382,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -405,7 +405,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -423,7 +423,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
spec:
containers:
- args:
@@ -447,7 +447,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.2@sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
+ image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -528,7 +528,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -539,7 +539,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
spec:
containers:
@@ -553,7 +553,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -571,6 +571,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: batch/v1
kind: Job
@@ -580,7 +581,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -591,7 +592,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
spec:
containers:
@@ -607,7 +608,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -625,6 +626,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
@@ -634,7 +636,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -647,7 +649,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/kind/deploy.yaml b/deploy/static/provider/kind/deploy.yaml
index 0e84ece112..0723a24a62 100644
--- a/deploy/static/provider/kind/deploy.yaml
+++ b/deploy/static/provider/kind/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -340,7 +340,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -372,7 +372,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -395,7 +395,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -417,7 +417,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
spec:
containers:
- args:
@@ -442,7 +442,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.2@sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
+ image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -529,7 +529,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -540,7 +540,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
spec:
containers:
@@ -554,7 +554,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -572,6 +572,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: batch/v1
kind: Job
@@ -581,7 +582,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -592,7 +593,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
spec:
containers:
@@ -608,7 +609,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -626,6 +627,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
@@ -635,7 +637,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -648,7 +650,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/oracle/deploy.yaml b/deploy/static/provider/oracle/deploy.yaml
index 2cbc512a31..8157176fa7 100644
--- a/deploy/static/provider/oracle/deploy.yaml
+++ b/deploy/static/provider/oracle/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -344,7 +344,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -377,7 +377,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -400,7 +400,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -422,7 +422,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
spec:
containers:
- args:
@@ -446,7 +446,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.2@sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
+ image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -523,7 +523,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -534,7 +534,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
spec:
containers:
@@ -548,7 +548,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -566,6 +566,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: batch/v1
kind: Job
@@ -575,7 +576,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -586,7 +587,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
spec:
containers:
@@ -602,7 +603,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -620,6 +621,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
@@ -629,7 +631,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -642,7 +644,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/scw/deploy.yaml b/deploy/static/provider/scw/deploy.yaml
index a649161020..eee6adeaa5 100644
--- a/deploy/static/provider/scw/deploy.yaml
+++ b/deploy/static/provider/scw/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -329,7 +329,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -343,7 +343,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -376,7 +376,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -399,7 +399,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -421,7 +421,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
spec:
containers:
- args:
@@ -445,7 +445,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.2@sha256:03497ee984628e95eca9b2279e3f3a3c1685dd48635479e627d219f00c8eefa9
+ image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -522,7 +522,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -533,7 +533,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-create
spec:
containers:
@@ -547,7 +547,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -565,6 +565,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: batch/v1
kind: Job
@@ -574,7 +575,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -585,7 +586,7 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission-patch
spec:
containers:
@@ -601,7 +602,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3@sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -619,6 +620,7 @@ spec:
kubernetes.io/os: linux
restartPolicy: OnFailure
serviceAccountName: ingress-nginx-admission
+ ttlSecondsAfterFinished: 0
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
@@ -628,7 +630,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -641,7 +643,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.2
+ app.kubernetes.io/version: 1.12.3
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/docs/deploy/index.md b/docs/deploy/index.md
index 051c7f2831..498aaaa31b 100644
--- a/docs/deploy/index.md
+++ b/docs/deploy/index.md
@@ -92,7 +92,7 @@ helm show values ingress-nginx --repo https://kubernetes.github.io/ingress-nginx
**If you don't have Helm** or if you prefer to use a YAML manifest, you can run the following command instead:
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/cloud/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/cloud/deploy.yaml
```
!!! info
@@ -274,7 +274,7 @@ In AWS, we use a Network load balancer (NLB) to expose the Ingress-Nginx Control
##### Network Load Balancer (NLB)
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/aws/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/aws/deploy.yaml
```
##### TLS termination in AWS Load Balancer (NLB)
@@ -282,10 +282,10 @@ kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/cont
By default, TLS is terminated in the ingress controller. But it is also possible to terminate TLS in the Load Balancer.
This section explains how to do that on AWS using an NLB.
-1. Download the [deploy.yaml](https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml) template
+1. Download the [deploy.yaml](https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml) template
```console
- wget https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
+ wget https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
```
2. Edit the file and change the VPC CIDR in use for the Kubernetes cluster:
@@ -334,7 +334,7 @@ kubectl create clusterrolebinding cluster-admin-binding \
Then, the ingress controller can be installed like this:
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/cloud/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/cloud/deploy.yaml
```
!!! warning
@@ -351,7 +351,7 @@ Proxy-protocol is supported in GCE check the [Official Documentations on how to
#### Azure
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/cloud/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/cloud/deploy.yaml
```
More information with regard to Azure annotations for ingress controller can be found in the [official AKS documentation](https://docs.microsoft.com/en-us/azure/aks/ingress-internal-ip#create-an-ingress-controller).
@@ -359,7 +359,7 @@ More information with regard to Azure annotations for ingress controller can be
#### Digital Ocean
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/do/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/do/deploy.yaml
```
- By default the service object of the ingress-nginx-controller for Digital-Ocean, only configures one annotation. Its this one `service.beta.kubernetes.io/do-loadbalancer-enable-proxy-protocol: "true"`. While this makes the service functional, it was reported that the Digital-Ocean LoadBalancer graphs shows `no data`, unless a few other annotations are also configured. Some of these other annotations require values that can not be generic and hence not forced in a out-of-the-box installation. These annotations and a discussion on them is well documented in [this issue](https://github.com/kubernetes/ingress-nginx/issues/8965). Please refer to the issue to add annotations, with values specific to user, to get graphs of the DO-LB populated with data.
@@ -367,7 +367,7 @@ kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/cont
#### Scaleway
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/scw/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/scw/deploy.yaml
```
Refer to the [dedicated tutorial](https://www.scaleway.com/en/docs/tutorials/proxy-protocol-v2-load-balancer/#configuring-proxy-protocol-for-ingress-nginx) in the Scaleway documentation for configuring the proxy protocol for ingress-nginx with the Scaleway load balancer.
@@ -384,7 +384,7 @@ The full list of annotations supported by Exoscale is available in the Exoscale
#### Oracle Cloud Infrastructure
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/cloud/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/cloud/deploy.yaml
```
A
@@ -411,7 +411,7 @@ For quick testing, you can use a
This should work on almost every cluster, but it will typically use a port in the range 30000-32767.
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.2/deploy/static/provider/baremetal/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/baremetal/deploy.yaml
```
For more information about bare metal deployments (and how to use port 80 instead of a random port in the 30000-32767 range),
From 4bae1397532d159c01cadfe070ba21cacbbc98a4 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Thu, 5 Jun 2025 15:12:40 +0200
Subject: [PATCH 007/361] Images: Fix LuaRocks. (#13476)
---
images/e2e-test-echo/EXTRAARGS | 2 +-
images/e2e-test-echo/rootfs/Dockerfile | 6 +++---
images/test-runner/Makefile | 4 ++--
images/test-runner/rootfs/Dockerfile | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/images/e2e-test-echo/EXTRAARGS b/images/e2e-test-echo/EXTRAARGS
index 3db8aaa5c8..4f51ce9e5c 100644
--- a/images/e2e-test-echo/EXTRAARGS
+++ b/images/e2e-test-echo/EXTRAARGS
@@ -1 +1 @@
---build-arg LUAROCKS_VERSION=3.8.0 --build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7
\ No newline at end of file
+--build-arg LUAROCKS_VERSION=418d2ab34891b130cc317df32f65f978640febcf --build-arg LUAROCKS_SHA=5466eb5663620ef292090148adf1ab53a4fb2ff93780dca3e49f05c92d4d3a38
diff --git a/images/e2e-test-echo/rootfs/Dockerfile b/images/e2e-test-echo/rootfs/Dockerfile
index eaa9198355..f35974a0ab 100644
--- a/images/e2e-test-echo/rootfs/Dockerfile
+++ b/images/e2e-test-echo/rootfs/Dockerfile
@@ -2,13 +2,13 @@ ARG BASE_IMAGE
FROM ${BASE_IMAGE}
-RUN apk update && apk upgrade && apk add -U --no-cache perl curl make unzip
+RUN apk update && apk upgrade && apk add -U --no-cache perl curl make unzip wget
ARG LUAROCKS_VERSION
ARG LUAROCKS_SHA
RUN wget -O /tmp/luarocks.tgz \
- https://github.com/luarocks/luarocks/archive/v${LUAROCKS_VERSION}.tar.gz \
+ https://github.com/luarocks/luarocks/archive/${LUAROCKS_VERSION}.tar.gz \
&& echo "${LUAROCKS_SHA} */tmp/luarocks.tgz" | sha256sum -c - \
&& tar -C /tmp -xzf /tmp/luarocks.tgz \
&& cd /tmp/luarocks* \
@@ -17,4 +17,4 @@ RUN wget -O /tmp/luarocks.tgz \
RUN luarocks install lua-resty-template
-COPY nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile
index 5556e7544a..4d10a1717c 100644
--- a/images/test-runner/Makefile
+++ b/images/test-runner/Makefile
@@ -38,8 +38,8 @@ build: builder
--build-arg K8S_RELEASE=v1.33.1 \
--build-arg RESTY_CLI_VERSION=0.27 \
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
- --build-arg LUAROCKS_VERSION=3.8.0 \
- --build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7 \
+ --build-arg LUAROCKS_VERSION=418d2ab34891b130cc317df32f65f978640febcf \
+ --build-arg LUAROCKS_SHA=5466eb5663620ef292090148adf1ab53a4fb2ff93780dca3e49f05c92d4d3a38 \
--build-arg CHART_TESTING_VERSION=3.8.0 \
--build-arg YAML_LINT_VERSION=1.33.0 \
--build-arg YAMALE_VERSION=4.0.4 \
diff --git a/images/test-runner/rootfs/Dockerfile b/images/test-runner/rootfs/Dockerfile
index 69fae92d76..1d2fa1320b 100644
--- a/images/test-runner/rootfs/Dockerfile
+++ b/images/test-runner/rootfs/Dockerfile
@@ -81,7 +81,7 @@ RUN wget -qO /tmp/resty_cli.tgz \
&& rm -rf /tmp/*
RUN wget -qO /tmp/luarocks.tgz \
- https://github.com/luarocks/luarocks/archive/v${LUAROCKS_VERSION}.tar.gz \
+ https://github.com/luarocks/luarocks/archive/${LUAROCKS_VERSION}.tar.gz \
&& echo "${LUAROCKS_SHA} */tmp/luarocks.tgz" | sha256sum -c - \
&& tar -C /tmp -xzf /tmp/luarocks.tgz \
&& cd /tmp/luarocks* \
From 2363343c7ae7aa96b01f1f2bf17e2db411991414 Mon Sep 17 00:00:00 2001
From: Zeping Bai
Date: Sun, 8 Jun 2025 20:28:22 +0800
Subject: [PATCH 008/361] Images: Update LuaRocks to v3.12.0. (#13486)
---
images/e2e-test-echo/EXTRAARGS | 2 +-
images/test-runner/Makefile | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/images/e2e-test-echo/EXTRAARGS b/images/e2e-test-echo/EXTRAARGS
index 4f51ce9e5c..dea69ae69e 100644
--- a/images/e2e-test-echo/EXTRAARGS
+++ b/images/e2e-test-echo/EXTRAARGS
@@ -1 +1 @@
---build-arg LUAROCKS_VERSION=418d2ab34891b130cc317df32f65f978640febcf --build-arg LUAROCKS_SHA=5466eb5663620ef292090148adf1ab53a4fb2ff93780dca3e49f05c92d4d3a38
+--build-arg LUAROCKS_VERSION=v3.12.0 --build-arg LUAROCKS_SHA=745e3c5df2f955ecaf60ba1361cfc224564ef7ec210e9a784a3858ae853e9f7c
diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile
index 4d10a1717c..fdf99f923f 100644
--- a/images/test-runner/Makefile
+++ b/images/test-runner/Makefile
@@ -38,8 +38,8 @@ build: builder
--build-arg K8S_RELEASE=v1.33.1 \
--build-arg RESTY_CLI_VERSION=0.27 \
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
- --build-arg LUAROCKS_VERSION=418d2ab34891b130cc317df32f65f978640febcf \
- --build-arg LUAROCKS_SHA=5466eb5663620ef292090148adf1ab53a4fb2ff93780dca3e49f05c92d4d3a38 \
+ --build-arg LUAROCKS_VERSION=v3.12.0 \
+ --build-arg LUAROCKS_SHA=745e3c5df2f955ecaf60ba1361cfc224564ef7ec210e9a784a3858ae853e9f7c \
--build-arg CHART_TESTING_VERSION=3.8.0 \
--build-arg YAML_LINT_VERSION=1.33.0 \
--build-arg YAMALE_VERSION=4.0.4 \
From 44329a804efbdcec74fd91d62b988dc6f621ca8a Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Sun, 8 Jun 2025 18:10:22 +0200
Subject: [PATCH 009/361] Images: Bump Alpine to v3.22. (#13490)
---
Makefile | 2 +-
docs/examples/customization/sysctl/patch.json | 2 +-
images/cfssl/rootfs/Dockerfile | 2 +-
images/custom-error-pages/rootfs/Dockerfile | 2 +-
images/ext-auth-example-authsvc/rootfs/Dockerfile | 2 +-
images/fastcgi-helloserver/rootfs/Dockerfile | 2 +-
images/go-grpc-greeter-server/rootfs/Dockerfile | 2 +-
images/nginx/rootfs/Dockerfile | 4 ++--
images/nginx/rootfs/build.sh | 2 +-
images/test-runner/rootfs/Dockerfile | 2 +-
rootfs/Dockerfile-chroot | 2 +-
test/e2e-image/Dockerfile | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index dc7f0a204b..9cbbc91051 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ clean-chroot-image: ## Removes local image
.PHONY: build
build: ## Build ingress controller, debug tool and pre-stop hook.
- E2E_IMAGE=golang:$(GO_VERSION)-alpine3.21 USE_SHELL=/bin/sh build/run-in-docker.sh \
+ E2E_IMAGE=golang:$(GO_VERSION)-alpine3.22 USE_SHELL=/bin/sh build/run-in-docker.sh \
MAC_OS=$(MAC_OS) \
PKG=$(PKG) \
ARCH=$(ARCH) \
diff --git a/docs/examples/customization/sysctl/patch.json b/docs/examples/customization/sysctl/patch.json
index 69482c7bec..6f03fbff8a 100644
--- a/docs/examples/customization/sysctl/patch.json
+++ b/docs/examples/customization/sysctl/patch.json
@@ -4,7 +4,7 @@
"spec": {
"initContainers": [{
"name": "sysctl",
- "image": "alpine:3.21",
+ "image": "alpine:3.22",
"securityContext": {
"privileged": true
},
diff --git a/images/cfssl/rootfs/Dockerfile b/images/cfssl/rootfs/Dockerfile
index 3978c8f4ba..993770456a 100644
--- a/images/cfssl/rootfs/Dockerfile
+++ b/images/cfssl/rootfs/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM alpine:3.21
+FROM alpine:3.22
RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
RUN apk update \
diff --git a/images/custom-error-pages/rootfs/Dockerfile b/images/custom-error-pages/rootfs/Dockerfile
index f789e7afcd..01166a4098 100755
--- a/images/custom-error-pages/rootfs/Dockerfile
+++ b/images/custom-error-pages/rootfs/Dockerfile
@@ -14,7 +14,7 @@
ARG GOLANG_VERSION
-FROM golang:${GOLANG_VERSION}-alpine3.21 AS builder
+FROM golang:${GOLANG_VERSION}-alpine3.22 AS builder
RUN apk update \
&& apk upgrade && apk add git
diff --git a/images/ext-auth-example-authsvc/rootfs/Dockerfile b/images/ext-auth-example-authsvc/rootfs/Dockerfile
index dced61d99f..40c3573923 100644
--- a/images/ext-auth-example-authsvc/rootfs/Dockerfile
+++ b/images/ext-auth-example-authsvc/rootfs/Dockerfile
@@ -1,6 +1,6 @@
ARG GOLANG_VERSION
-FROM golang:${GOLANG_VERSION}-alpine3.21 AS builder
+FROM golang:${GOLANG_VERSION}-alpine3.22 AS builder
RUN mkdir /authsvc
WORKDIR /authsvc
COPY . ./
diff --git a/images/fastcgi-helloserver/rootfs/Dockerfile b/images/fastcgi-helloserver/rootfs/Dockerfile
index 8f1e73248e..1e63442669 100755
--- a/images/fastcgi-helloserver/rootfs/Dockerfile
+++ b/images/fastcgi-helloserver/rootfs/Dockerfile
@@ -13,7 +13,7 @@
# limitations under the License.
ARG GOLANG_VERSION
-FROM golang:${GOLANG_VERSION}-alpine3.21 AS builder
+FROM golang:${GOLANG_VERSION}-alpine3.22 AS builder
WORKDIR /go/src/k8s.io/ingress-nginx/images/fastcgi
diff --git a/images/go-grpc-greeter-server/rootfs/Dockerfile b/images/go-grpc-greeter-server/rootfs/Dockerfile
index a3b59fc2be..89a050b6d2 100644
--- a/images/go-grpc-greeter-server/rootfs/Dockerfile
+++ b/images/go-grpc-greeter-server/rootfs/Dockerfile
@@ -1,6 +1,6 @@
ARG GOLANG_VERSION
-FROM golang:${GOLANG_VERSION}-alpine3.21 AS build
+FROM golang:${GOLANG_VERSION}-alpine3.22 AS build
WORKDIR /go/src/greeter-server
diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile
index 8f6bab1379..c2b9af4126 100644
--- a/images/nginx/rootfs/Dockerfile
+++ b/images/nginx/rootfs/Dockerfile
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM alpine:3.21 AS builder
+FROM alpine:3.22 AS builder
COPY . /
@@ -21,7 +21,7 @@ RUN apk update \
&& /build.sh
# Use a multi-stage build
-FROM alpine:3.21
+FROM alpine:3.22
ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin
diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh
index 2e1a8fafe4..45928c5e20 100755
--- a/images/nginx/rootfs/build.sh
+++ b/images/nginx/rootfs/build.sh
@@ -413,7 +413,7 @@ Include /etc/nginx/owasp-modsecurity-crs/rules/RESPONSE-999-EXCLUSION-RULES-AFTE
# NGINX compiles a small test program to check if an added module works as expected.
#
# ModSecurity-nginx provides 'printf("hello");' as a test, but newer versions of GCC,
-# as included in Alpine 3.21, do not allow implicit declaration of function 'printf':
+# as included in Alpine 3.22, do not allow implicit declaration of function 'printf':
#
# objs/autotest.c:7:5: error: implicit declaration of function 'printf' [-Wimplicit-function-declaration]
#
diff --git a/images/test-runner/rootfs/Dockerfile b/images/test-runner/rootfs/Dockerfile
index 1d2fa1320b..dc8ff5593b 100644
--- a/images/test-runner/rootfs/Dockerfile
+++ b/images/test-runner/rootfs/Dockerfile
@@ -15,7 +15,7 @@ ARG BASE_IMAGE
ARG GOLANG_VERSION
ARG ETCD_VERSION
-FROM golang:${GOLANG_VERSION}-alpine3.21 AS go
+FROM golang:${GOLANG_VERSION}-alpine3.22 AS go
FROM registry.k8s.io/etcd:${ETCD_VERSION} AS etcd
FROM ${BASE_IMAGE}
diff --git a/rootfs/Dockerfile-chroot b/rootfs/Dockerfile-chroot
index 08863610fa..116a97b26c 100644
--- a/rootfs/Dockerfile-chroot
+++ b/rootfs/Dockerfile-chroot
@@ -23,7 +23,7 @@ RUN apk update \
&& apk upgrade \
&& /chroot.sh
-FROM alpine:3.21
+FROM alpine:3.22
ARG TARGETARCH
ARG VERSION
diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
index c16545e439..85bac508ac 100644
--- a/test/e2e-image/Dockerfile
+++ b/test/e2e-image/Dockerfile
@@ -1,7 +1,7 @@
ARG E2E_BASE_IMAGE
FROM ${E2E_BASE_IMAGE} AS BASE
-FROM alpine:3.21
+FROM alpine:3.22
RUN apk update \
&& apk upgrade && apk add -U --no-cache \
From d432b108a91a32b11f6df0b8e53c965aa836a99d Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Sun, 8 Jun 2025 19:22:23 +0200
Subject: [PATCH 010/361] Go: Bump to v1.24.4. (#13493)
---
GOLANG_VERSION | 2 +-
go.mod | 2 +-
images/custom-error-pages/rootfs/go.mod | 2 +-
images/ext-auth-example-authsvc/rootfs/go.mod | 2 +-
images/fastcgi-helloserver/rootfs/go.mod | 2 +-
images/go-grpc-greeter-server/rootfs/go.mod | 2 +-
images/kube-webhook-certgen/rootfs/go.mod | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/GOLANG_VERSION b/GOLANG_VERSION
index ae96cc7310..2f4320f67f 100644
--- a/GOLANG_VERSION
+++ b/GOLANG_VERSION
@@ -1 +1 @@
-1.24.3
+1.24.4
diff --git a/go.mod b/go.mod
index 3da3884512..1c5af90280 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module k8s.io/ingress-nginx
-go 1.24.3
+go 1.24.4
require (
dario.cat/mergo v1.0.2
diff --git a/images/custom-error-pages/rootfs/go.mod b/images/custom-error-pages/rootfs/go.mod
index e408d5ccf9..9e5cabd6be 100644
--- a/images/custom-error-pages/rootfs/go.mod
+++ b/images/custom-error-pages/rootfs/go.mod
@@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/custom-error-pages
-go 1.24.3
+go 1.24.4
require github.com/prometheus/client_golang v1.22.0
diff --git a/images/ext-auth-example-authsvc/rootfs/go.mod b/images/ext-auth-example-authsvc/rootfs/go.mod
index 0f6ce29c7f..b0a125097f 100644
--- a/images/ext-auth-example-authsvc/rootfs/go.mod
+++ b/images/ext-auth-example-authsvc/rootfs/go.mod
@@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/ext-auth-example-authsvc
-go 1.24.3
+go 1.24.4
require k8s.io/apimachinery v0.33.1
diff --git a/images/fastcgi-helloserver/rootfs/go.mod b/images/fastcgi-helloserver/rootfs/go.mod
index f7749d93b5..70a7550639 100644
--- a/images/fastcgi-helloserver/rootfs/go.mod
+++ b/images/fastcgi-helloserver/rootfs/go.mod
@@ -1,3 +1,3 @@
module k8s.io/ingress-nginx/fastcgi-helloserver
-go 1.24.3
+go 1.24.4
diff --git a/images/go-grpc-greeter-server/rootfs/go.mod b/images/go-grpc-greeter-server/rootfs/go.mod
index bcf224d447..4afba0cfc7 100644
--- a/images/go-grpc-greeter-server/rootfs/go.mod
+++ b/images/go-grpc-greeter-server/rootfs/go.mod
@@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/go-grpc-greeter-server
-go 1.24.3
+go 1.24.4
require (
google.golang.org/grpc v1.72.2
diff --git a/images/kube-webhook-certgen/rootfs/go.mod b/images/kube-webhook-certgen/rootfs/go.mod
index 0e427d435c..18c49dcad5 100644
--- a/images/kube-webhook-certgen/rootfs/go.mod
+++ b/images/kube-webhook-certgen/rootfs/go.mod
@@ -1,6 +1,6 @@
module github.com/jet/kube-webhook-certgen
-go 1.24.3
+go 1.24.4
require (
github.com/onrik/logrus v0.11.0
From 10900bccfef04f7b7d69fefff4d8aea3d0c2407d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 07:28:24 -0700
Subject: [PATCH 011/361] Bump the actions group with 2 updates (#13498)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/scorecards.yml | 2 +-
.github/workflows/vulnerability-scans.yaml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 0d1b26b297..43befdd301 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -59,6 +59,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+ uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
with:
sarif_file: results.sarif
diff --git a/.github/workflows/vulnerability-scans.yaml b/.github/workflows/vulnerability-scans.yaml
index 3b344b6e15..7b5ba14e10 100644
--- a/.github/workflows/vulnerability-scans.yaml
+++ b/.github/workflows/vulnerability-scans.yaml
@@ -60,7 +60,7 @@ jobs:
- name: Scan image with AquaSec/Trivy
id: scan
- uses: aquasecurity/trivy-action@6c175e9c4083a92bbca2f9724c8a5e33bc2d97a5 # v0.30.0
+ uses: aquasecurity/trivy-action@76071ef0d7ec797419534a183b498b4d6366cf37 # v0.31.0
with:
image-ref: registry.k8s.io/ingress-nginx/controller:${{ matrix.versions }}
format: 'sarif'
@@ -75,7 +75,7 @@ jobs:
# This step checks out a copy of your repository.
- name: Upload SARIF file
- uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+ uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
with:
token: ${{ github.token }}
# Path to SARIF file relative to the root of the repository
From f58bb231f788aeda962d3c6f8b10f1f5e4c2d1f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 07:30:24 -0700
Subject: [PATCH 012/361] Bump golang.org/x/crypto from 0.38.0 to 0.39.0
(#13500)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
go.mod | 10 +++++-----
go.sum | 16 ++++++++--------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/go.mod b/go.mod
index 1c5af90280..b996203ccb 100644
--- a/go.mod
+++ b/go.mod
@@ -29,7 +29,7 @@ require (
github.com/vmware-labs/yaml-jsonpath v0.3.2
github.com/yudai/gojsondiff v1.0.0
github.com/zakjan/cert-chain-resolver v0.0.0-20221221105603-fcedb00c5b30
- golang.org/x/crypto v0.38.0
+ golang.org/x/crypto v0.39.0
google.golang.org/grpc v1.72.2
gopkg.in/go-playground/pool.v3 v3.1.1
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
@@ -120,13 +120,13 @@ require (
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
github.com/yudai/pp v2.0.1+incompatible // indirect
- golang.org/x/mod v0.24.0 // indirect
+ golang.org/x/mod v0.25.0 // indirect
golang.org/x/net v0.40.0 // indirect
golang.org/x/oauth2 v0.30.0
- golang.org/x/sync v0.14.0 // indirect
+ golang.org/x/sync v0.15.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
- golang.org/x/text v0.25.0 // indirect
+ golang.org/x/text v0.26.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/tools v0.33.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
@@ -136,7 +136,7 @@ require (
gopkg.in/yaml.v3 v3.0.1
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
- k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
+ k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/api v0.19.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
diff --git a/go.sum b/go.sum
index a2b857b8e4..70975f871f 100644
--- a/go.sum
+++ b/go.sum
@@ -253,12 +253,12 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
+golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
+golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
+golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -272,8 +272,8 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -288,8 +288,8 @@ golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
From 32186561f70b7746bdfed476c3a854e8bce96978 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 07:36:24 -0700
Subject: [PATCH 013/361] Bump google.golang.org/grpc from 1.72.2 to 1.73.0 in
/images/go-grpc-greeter-server/rootfs (#13501)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
images/go-grpc-greeter-server/rootfs/go.mod | 3 +--
images/go-grpc-greeter-server/rootfs/go.sum | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/images/go-grpc-greeter-server/rootfs/go.mod b/images/go-grpc-greeter-server/rootfs/go.mod
index 4afba0cfc7..f167f326fd 100644
--- a/images/go-grpc-greeter-server/rootfs/go.mod
+++ b/images/go-grpc-greeter-server/rootfs/go.mod
@@ -3,12 +3,11 @@ module k8s.io/ingress-nginx/go-grpc-greeter-server
go 1.24.4
require (
- google.golang.org/grpc v1.72.2
+ google.golang.org/grpc v1.73.0
google.golang.org/grpc/examples v0.0.0-20250526155028-4cab0e6dc6e7
)
require (
- github.com/google/go-cmp v0.7.0 // indirect
golang.org/x/net v0.40.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.25.0 // indirect
diff --git a/images/go-grpc-greeter-server/rootfs/go.sum b/images/go-grpc-greeter-server/rootfs/go.sum
index c7071ed659..1fa8776356 100644
--- a/images/go-grpc-greeter-server/rootfs/go.sum
+++ b/images/go-grpc-greeter-server/rootfs/go.sum
@@ -28,8 +28,8 @@ golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
-google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
-google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
+google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
+google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
google.golang.org/grpc/examples v0.0.0-20250526155028-4cab0e6dc6e7 h1:qmTRTvUbC4g5DBQbWBBaK8fZfUH0nV7F0Vr0MfLr2Lw=
google.golang.org/grpc/examples v0.0.0-20250526155028-4cab0e6dc6e7/go.mod h1:tVWJxR8lMn4AFXavKgoU/QtZvQ+E6K1HNS6Q/FuqMxc=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
From 09e9b8c43d94648817c09d246052c57c7610ab1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 08:32:24 -0700
Subject: [PATCH 014/361] Bump google.golang.org/grpc from 1.72.2 to 1.73.0
(#13499)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
go.mod | 2 +-
go.sum | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/go.mod b/go.mod
index b996203ccb..de3714929c 100644
--- a/go.mod
+++ b/go.mod
@@ -30,7 +30,7 @@ require (
github.com/yudai/gojsondiff v1.0.0
github.com/zakjan/cert-chain-resolver v0.0.0-20221221105603-fcedb00c5b30
golang.org/x/crypto v0.39.0
- google.golang.org/grpc v1.72.2
+ google.golang.org/grpc v1.73.0
gopkg.in/go-playground/pool.v3 v3.1.1
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
k8s.io/api v0.33.1
diff --git a/go.sum b/go.sum
index 70975f871f..ed1988fa55 100644
--- a/go.sum
+++ b/go.sum
@@ -236,10 +236,10 @@ go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
-go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
-go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
-go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
-go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
+go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
+go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
+go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
@@ -306,8 +306,8 @@ gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
-google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
-google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
+google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
+google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
From 311a2082c5622c7bdaff24273110e6f2a0f3b5da Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Mon, 9 Jun 2025 18:50:23 +0200
Subject: [PATCH 015/361] Go: Update dependencies. (#13510)
---
go.mod | 16 ++++-----
go.sum | 32 ++++++++---------
images/go-grpc-greeter-server/rootfs/go.mod | 8 ++---
images/go-grpc-greeter-server/rootfs/go.sum | 40 ++++++++++-----------
images/kube-webhook-certgen/rootfs/go.mod | 10 +++---
images/kube-webhook-certgen/rootfs/go.sum | 24 ++++++-------
6 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/go.mod b/go.mod
index de3714929c..60204d0e9a 100644
--- a/go.mod
+++ b/go.mod
@@ -82,7 +82,7 @@ require (
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
github.com/go-errors/errors v1.5.1 // indirect
- github.com/go-logr/logr v1.4.2 // indirect
+ github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
@@ -94,7 +94,7 @@ require (
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.7.0 // indirect
- github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect
+ github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -115,28 +115,28 @@ require (
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
- github.com/sergi/go-diff v1.3.1 // indirect
+ github.com/sergi/go-diff v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
github.com/yudai/pp v2.0.1+incompatible // indirect
golang.org/x/mod v0.25.0 // indirect
- golang.org/x/net v0.40.0 // indirect
+ golang.org/x/net v0.41.0 // indirect
golang.org/x/oauth2 v0.30.0
golang.org/x/sync v0.15.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.26.0 // indirect
- golang.org/x/time v0.11.0 // indirect
- golang.org/x/tools v0.33.0 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
+ golang.org/x/time v0.12.0 // indirect
+ golang.org/x/tools v0.34.0 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
- k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
+ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/api v0.19.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
diff --git a/go.sum b/go.sum
index ed1988fa55..1068a51fe7 100644
--- a/go.sum
+++ b/go.sum
@@ -52,8 +52,8 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
@@ -91,8 +91,8 @@ github.com/google/go-github/v48 v48.2.0/go.mod h1:dDlehKBDo850ZPvCTK0sEqTCVWcrGl
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20250501235452-c0086092b71a h1:rDA3FfmxwXR+BVKKdz55WwMJ1pD2hJQNW31d+l3mPk4=
-github.com/google/pprof v0.0.0-20250501235452-c0086092b71a/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
+github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a h1://KbezygeMJZCSHH+HgUZiTeSoiuFspbMg1ge+eFj18=
+github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -195,8 +195,8 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
-github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
+github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
+github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
@@ -264,8 +264,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -290,22 +290,22 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
-golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
-golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
-golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
@@ -360,8 +360,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
-k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 h1:jgJW5IePPXLGB8e/1wvd0Ich9QE97RvvF3a8J3fP/Lg=
-k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732 h1:SAElp8THCfmBdM+4lmWX5gebiSSkEr7PAYDVF91qpfg=
pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732/go.mod h1:lpvCfhqEHNJSSpG5R5A2EgsVzG8RTt4RfPoQuRAcDmg=
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
diff --git a/images/go-grpc-greeter-server/rootfs/go.mod b/images/go-grpc-greeter-server/rootfs/go.mod
index f167f326fd..f192e666bc 100644
--- a/images/go-grpc-greeter-server/rootfs/go.mod
+++ b/images/go-grpc-greeter-server/rootfs/go.mod
@@ -4,13 +4,13 @@ go 1.24.4
require (
google.golang.org/grpc v1.73.0
- google.golang.org/grpc/examples v0.0.0-20250526155028-4cab0e6dc6e7
+ google.golang.org/grpc/examples v0.0.0-20250609053427-af0f88e01d4a
)
require (
- golang.org/x/net v0.40.0 // indirect
+ golang.org/x/net v0.41.0 // indirect
golang.org/x/sys v0.33.0 // indirect
- golang.org/x/text v0.25.0 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
+ golang.org/x/text v0.26.0 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/protobuf v1.36.6 // indirect
)
diff --git a/images/go-grpc-greeter-server/rootfs/go.sum b/images/go-grpc-greeter-server/rootfs/go.sum
index 1fa8776356..db4db0ada9 100644
--- a/images/go-grpc-greeter-server/rootfs/go.sum
+++ b/images/go-grpc-greeter-server/rootfs/go.sum
@@ -1,5 +1,5 @@
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
@@ -10,27 +10,27 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
-go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
-go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
-go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
-go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
-go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
-go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
-go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
-go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
-go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
-golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
+go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
+go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
+go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
+go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
+go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
+go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
+go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
+go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
+go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
-google.golang.org/grpc/examples v0.0.0-20250526155028-4cab0e6dc6e7 h1:qmTRTvUbC4g5DBQbWBBaK8fZfUH0nV7F0Vr0MfLr2Lw=
-google.golang.org/grpc/examples v0.0.0-20250526155028-4cab0e6dc6e7/go.mod h1:tVWJxR8lMn4AFXavKgoU/QtZvQ+E6K1HNS6Q/FuqMxc=
+google.golang.org/grpc/examples v0.0.0-20250609053427-af0f88e01d4a h1:WQdF4uMwFQjfcckTef19EDVIzmolsBsdU4Rkjj1scDc=
+google.golang.org/grpc/examples v0.0.0-20250609053427-af0f88e01d4a/go.mod h1:LEu4MhKupt/g4nRi+hCu5zfi4M84eGk0vBQLQKs9y9U=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
diff --git a/images/kube-webhook-certgen/rootfs/go.mod b/images/kube-webhook-certgen/rootfs/go.mod
index 18c49dcad5..4e73a24c36 100644
--- a/images/kube-webhook-certgen/rootfs/go.mod
+++ b/images/kube-webhook-certgen/rootfs/go.mod
@@ -16,7 +16,7 @@ require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
- github.com/go-logr/logr v1.4.2 // indirect
+ github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
@@ -36,19 +36,19 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/x448/float16 v0.8.4 // indirect
- golang.org/x/net v0.40.0 // indirect
+ golang.org/x/net v0.41.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
- golang.org/x/text v0.25.0 // indirect
- golang.org/x/time v0.11.0 // indirect
+ golang.org/x/text v0.26.0 // indirect
+ golang.org/x/time v0.12.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
- k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
+ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
diff --git a/images/kube-webhook-certgen/rootfs/go.sum b/images/kube-webhook-certgen/rootfs/go.sum
index 5defb14a46..32f764f376 100644
--- a/images/kube-webhook-certgen/rootfs/go.sum
+++ b/images/kube-webhook-certgen/rootfs/go.sum
@@ -7,8 +7,8 @@ github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf
github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-openapi/jsonpointer v0.21.1 h1:whnzv/pNXtK2FbX/W9yJfRmE2gsmkfahjMKB0fZvcic=
github.com/go-openapi/jsonpointer v0.21.1/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk=
github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
@@ -97,8 +97,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -114,16 +114,16 @@ golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
-golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
-golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
+golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
+golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -152,8 +152,8 @@ k8s.io/kube-aggregator v0.33.1 h1:PigQUqAvd6Y4hBjQAqhKz3lEJC2VHLL4bSOEuS06a40=
k8s.io/kube-aggregator v0.33.1/go.mod h1:16/wlU5Lj7hNJSv7JSu5FLvxyrgiJVLCHzfVoECAsuI=
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
-k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 h1:jgJW5IePPXLGB8e/1wvd0Ich9QE97RvvF3a8J3fP/Lg=
-k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
From 6338a3ac71f5b5e38971d81dd80a49ca51e563d4 Mon Sep 17 00:00:00 2001
From: hrdkmshra
Date: Tue, 10 Jun 2025 14:04:24 +0530
Subject: [PATCH 016/361] Chart: Add `activeDeadlineSeconds`. (#13497)
---
charts/ingress-nginx/README.md | 2 ++
.../admission-webhooks/job-patch/job-createSecret.yaml | 3 +++
.../admission-webhooks/job-patch/job-patchWebhook.yaml | 3 +++
.../job-patch/job-createSecret_test.yaml | 8 ++++++++
.../job-patch/job-patchWebhook_test.yaml | 8 ++++++++
charts/ingress-nginx/values.yaml | 4 ++++
6 files changed, 28 insertions(+)
diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md
index 14fe587c05..654517f6d2 100644
--- a/charts/ingress-nginx/README.md
+++ b/charts/ingress-nginx/README.md
@@ -260,6 +260,7 @@ metadata:
| controller.admissionWebhooks.certManager.rootCert.duration | string | `""` | |
| controller.admissionWebhooks.certManager.rootCert.revisionHistoryLimit | int | `0` | Revision history limit of the root certificate. Ref.: https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificateSpec |
| controller.admissionWebhooks.certificate | string | `"/usr/local/certificates/cert"` | |
+| controller.admissionWebhooks.createSecretJob.activeDeadlineSeconds | int | `0` | Deadline in seconds for the job to complete. Must be greater than 0 to enforce. If unset or 0, no deadline is enforced. |
| controller.admissionWebhooks.createSecretJob.name | string | `"create"` | |
| controller.admissionWebhooks.createSecretJob.resources | object | `{}` | |
| controller.admissionWebhooks.createSecretJob.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":65532,"runAsNonRoot":true,"runAsUser":65532,"seccompProfile":{"type":"RuntimeDefault"}}` | Security context for secret creation containers |
@@ -290,6 +291,7 @@ metadata:
| controller.admissionWebhooks.patch.serviceAccount.create | bool | `true` | Create a service account or not |
| controller.admissionWebhooks.patch.serviceAccount.name | string | `""` | Custom service account name |
| controller.admissionWebhooks.patch.tolerations | list | `[]` | |
+| controller.admissionWebhooks.patchWebhookJob.activeDeadlineSeconds | int | `0` | Deadline in seconds for the job to complete. Must be greater than 0 to enforce. If unset or 0, no deadline is enforced. |
| controller.admissionWebhooks.patchWebhookJob.name | string | `"patch"` | |
| controller.admissionWebhooks.patchWebhookJob.resources | object | `{}` | |
| controller.admissionWebhooks.patchWebhookJob.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":65532,"runAsNonRoot":true,"runAsUser":65532,"seccompProfile":{"type":"RuntimeDefault"}}` | Security context for webhook patch containers |
diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
index 83e71b48ba..d25ece1f56 100644
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -18,6 +18,9 @@ metadata:
{{- end }}
spec:
ttlSecondsAfterFinished: 0
+{{- if gt (int .Values.controller.admissionWebhooks.createSecretJob.activeDeadlineSeconds) 0 }}
+ activeDeadlineSeconds: {{ .Values.controller.admissionWebhooks.createSecretJob.activeDeadlineSeconds }}
+{{- end }}
template:
metadata:
name: {{ include "ingress-nginx.admissionWebhooks.createSecretJob.fullname" . }}
diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
index a2538ec269..11f99470a6 100644
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -18,6 +18,9 @@ metadata:
{{- end }}
spec:
ttlSecondsAfterFinished: 0
+{{- if gt (int .Values.controller.admissionWebhooks.patchWebhookJob.activeDeadlineSeconds) 0 }}
+ activeDeadlineSeconds: {{ .Values.controller.admissionWebhooks.patchWebhookJob.activeDeadlineSeconds }}
+{{- end }}
template:
metadata:
name: {{ include "ingress-nginx.admissionWebhooks.patchWebhookJob.fullname" . }}
diff --git a/charts/ingress-nginx/tests/admission-webhooks/job-patch/job-createSecret_test.yaml b/charts/ingress-nginx/tests/admission-webhooks/job-patch/job-createSecret_test.yaml
index b5272553b2..875dda1520 100644
--- a/charts/ingress-nginx/tests/admission-webhooks/job-patch/job-createSecret_test.yaml
+++ b/charts/ingress-nginx/tests/admission-webhooks/job-patch/job-createSecret_test.yaml
@@ -10,3 +10,11 @@ tests:
- equal:
path: spec.template.spec.automountServiceAccountToken
value: false
+
+ - it: should create a Job with `activeDeadlineSeconds` if `controller.admissionWebhooks.createSecretJob.activeDeadlineSeconds ` is set
+ set:
+ controller.admissionWebhooks.createSecretJob.activeDeadlineSeconds: 1
+ asserts:
+ - equal:
+ path: spec.activeDeadlineSeconds
+ value: 1
diff --git a/charts/ingress-nginx/tests/admission-webhooks/job-patch/job-patchWebhook_test.yaml b/charts/ingress-nginx/tests/admission-webhooks/job-patch/job-patchWebhook_test.yaml
index ca4c6b4c21..ef8e497cfb 100644
--- a/charts/ingress-nginx/tests/admission-webhooks/job-patch/job-patchWebhook_test.yaml
+++ b/charts/ingress-nginx/tests/admission-webhooks/job-patch/job-patchWebhook_test.yaml
@@ -10,3 +10,11 @@ tests:
- equal:
path: spec.template.spec.automountServiceAccountToken
value: false
+
+ - it: should create a Job with `activeDeadlineSeconds` if `controller.admissionWebhooks.patchWebhookJob.activeDeadlineSeconds ` is set
+ set:
+ controller.admissionWebhooks.patchWebhookJob.activeDeadlineSeconds: 1
+ asserts:
+ - equal:
+ path: spec.activeDeadlineSeconds
+ value: 1
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 1083527bcc..a2ca4ec2ee 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -776,6 +776,8 @@ controller:
type: ClusterIP
createSecretJob:
name: create
+ # -- Deadline in seconds for the job to complete. Must be greater than 0 to enforce. If unset or 0, no deadline is enforced.
+ activeDeadlineSeconds: 0
# -- Security context for secret creation containers
securityContext:
runAsNonRoot: true
@@ -797,6 +799,8 @@ controller:
# memory: 20Mi
patchWebhookJob:
name: patch
+ # -- Deadline in seconds for the job to complete. Must be greater than 0 to enforce. If unset or 0, no deadline is enforced.
+ activeDeadlineSeconds: 0
# -- Security context for webhook patch containers
securityContext:
runAsNonRoot: true
From cbf5f275082282441f24c56e38f8b65140b5907f Mon Sep 17 00:00:00 2001
From: cuithon <65674308+cuithon@users.noreply.github.com>
Date: Mon, 16 Jun 2025 13:32:58 +0800
Subject: [PATCH 017/361] Docs: Fix function names in comments. (#13517)
Signed-off-by: cuithon
---
internal/ingress/annotations/auth/main.go | 2 +-
test/e2e/framework/deployment.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/internal/ingress/annotations/auth/main.go b/internal/ingress/annotations/auth/main.go
index 79e3ce5d38..840b3c61cd 100644
--- a/internal/ingress/annotations/auth/main.go
+++ b/internal/ingress/annotations/auth/main.go
@@ -242,7 +242,7 @@ func (a auth) Parse(ing *networking.Ingress) (interface{}, error) {
}, nil
}
-// dumpSecret dumps the content of a secret into a file
+// dumpSecretAuthFile dumps the content of a secret into a file
// in the expected format for the specified authorization
func dumpSecretAuthFile(filename string, secret *api.Secret) error {
val, ok := secret.Data["auth"]
diff --git a/test/e2e/framework/deployment.go b/test/e2e/framework/deployment.go
index 215f1a8cd4..8ac1451b0b 100644
--- a/test/e2e/framework/deployment.go
+++ b/test/e2e/framework/deployment.go
@@ -158,7 +158,7 @@ func (f *Framework) NewEchoDeployment(opts ...func(*deploymentOptions)) {
assert.Nil(ginkgo.GinkgoT(), err, "waiting for endpoints to become ready")
}
-// BuildNipHost used to generate a nip host for DNS resolving
+// BuildNIPHost used to generate a nip host for DNS resolving
func BuildNIPHost(ip string) string {
return fmt.Sprintf("%s.nip.io", ip)
}
From e2b7261b77e66e24ec0e8276cfe94d31406397da Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Mon, 16 Jun 2025 10:54:58 +0200
Subject: [PATCH 018/361] Go: Update dependencies. (#13520)
---
go.mod | 2 +-
go.sum | 4 ++--
images/go-grpc-greeter-server/rootfs/go.mod | 2 +-
images/go-grpc-greeter-server/rootfs/go.sum | 4 ++--
images/kube-webhook-certgen/rootfs/go.mod | 2 +-
images/kube-webhook-certgen/rootfs/go.sum | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/go.mod b/go.mod
index 60204d0e9a..f5dae780c3 100644
--- a/go.mod
+++ b/go.mod
@@ -135,7 +135,7 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
- k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+ k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/api v0.19.0 // indirect
diff --git a/go.sum b/go.sum
index 1068a51fe7..030ef9053a 100644
--- a/go.sum
+++ b/go.sum
@@ -358,8 +358,8 @@ k8s.io/helm v2.17.0+incompatible h1:Bpn6o1wKLYqKM3+Osh8e+1/K2g/GsQJ4F4yNF2+deao=
k8s.io/helm v2.17.0+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
-k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
+k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
+k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732 h1:SAElp8THCfmBdM+4lmWX5gebiSSkEr7PAYDVF91qpfg=
diff --git a/images/go-grpc-greeter-server/rootfs/go.mod b/images/go-grpc-greeter-server/rootfs/go.mod
index f192e666bc..496a8d3357 100644
--- a/images/go-grpc-greeter-server/rootfs/go.mod
+++ b/images/go-grpc-greeter-server/rootfs/go.mod
@@ -4,7 +4,7 @@ go 1.24.4
require (
google.golang.org/grpc v1.73.0
- google.golang.org/grpc/examples v0.0.0-20250609053427-af0f88e01d4a
+ google.golang.org/grpc/examples v0.0.0-20250611162622-57400b4e6918
)
require (
diff --git a/images/go-grpc-greeter-server/rootfs/go.sum b/images/go-grpc-greeter-server/rootfs/go.sum
index db4db0ada9..3e1eed20f5 100644
--- a/images/go-grpc-greeter-server/rootfs/go.sum
+++ b/images/go-grpc-greeter-server/rootfs/go.sum
@@ -30,7 +30,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
-google.golang.org/grpc/examples v0.0.0-20250609053427-af0f88e01d4a h1:WQdF4uMwFQjfcckTef19EDVIzmolsBsdU4Rkjj1scDc=
-google.golang.org/grpc/examples v0.0.0-20250609053427-af0f88e01d4a/go.mod h1:LEu4MhKupt/g4nRi+hCu5zfi4M84eGk0vBQLQKs9y9U=
+google.golang.org/grpc/examples v0.0.0-20250611162622-57400b4e6918 h1:bBfndLYT4aIDLTM+t67TS5++5BjCRfLeJsOJmwoeNdM=
+google.golang.org/grpc/examples v0.0.0-20250611162622-57400b4e6918/go.mod h1:LEu4MhKupt/g4nRi+hCu5zfi4M84eGk0vBQLQKs9y9U=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
diff --git a/images/kube-webhook-certgen/rootfs/go.mod b/images/kube-webhook-certgen/rootfs/go.mod
index 4e73a24c36..bb3163ae5f 100644
--- a/images/kube-webhook-certgen/rootfs/go.mod
+++ b/images/kube-webhook-certgen/rootfs/go.mod
@@ -47,7 +47,7 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
- k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+ k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
diff --git a/images/kube-webhook-certgen/rootfs/go.sum b/images/kube-webhook-certgen/rootfs/go.sum
index 32f764f376..4d6f390284 100644
--- a/images/kube-webhook-certgen/rootfs/go.sum
+++ b/images/kube-webhook-certgen/rootfs/go.sum
@@ -150,8 +150,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-aggregator v0.33.1 h1:PigQUqAvd6Y4hBjQAqhKz3lEJC2VHLL4bSOEuS06a40=
k8s.io/kube-aggregator v0.33.1/go.mod h1:16/wlU5Lj7hNJSv7JSu5FLvxyrgiJVLCHzfVoECAsuI=
-k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
-k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
+k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
+k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
From 039edcd87dceb6c9624cfd7591ae25fc8ebd8ea1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jun 2025 06:15:00 -0700
Subject: [PATCH 019/361] Bump github/codeql-action from 3.28.19 to 3.29.0 in
the actions group (#13525)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/scorecards.yml | 2 +-
.github/workflows/vulnerability-scans.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 43befdd301..eddf4b3a53 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -59,6 +59,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
+ uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
with:
sarif_file: results.sarif
diff --git a/.github/workflows/vulnerability-scans.yaml b/.github/workflows/vulnerability-scans.yaml
index 7b5ba14e10..4e8d83cb00 100644
--- a/.github/workflows/vulnerability-scans.yaml
+++ b/.github/workflows/vulnerability-scans.yaml
@@ -75,7 +75,7 @@ jobs:
# This step checks out a copy of your repository.
- name: Upload SARIF file
- uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
+ uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
with:
token: ${{ github.token }}
# Path to SARIF file relative to the root of the repository
From cd5c23cc65c22a5bf4169ef8877df461152ce2cb Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Wed, 18 Jun 2025 13:48:50 +0200
Subject: [PATCH 020/361] NGINX: Bump to OpenResty v1.27.1.2. (#13524)
---
images/nginx/rootfs/build.sh | 32 +-
...nx-1.27.1-stream_ssl_preread_no_skip.patch | 11 +-
.../28_nginx-1.27.1-CVE-2025-23419.patch | 87 +++
...ginx-1.27.1-upstream_timeout_fields.patch} | 0
...nx-1.27.1-safe_resolver_ipv6_option.patch} | 0
...h => 31_nginx-1.27.1-socket_cloexec.patch} | 0
...x-1.27.1-reuseport_close_unused_fds.patch} | 0
...> 33_nginx-1.27.1-proc_exit_handler.patch} | 0
...ginx-1.27.1-stream_proxy_protocol_v2.patch | 630 ++++++++++++++++++
9 files changed, 741 insertions(+), 19 deletions(-)
create mode 100644 images/nginx/rootfs/patches/28_nginx-1.27.1-CVE-2025-23419.patch
rename images/nginx/rootfs/patches/{28_nginx-1.27.1-upstream_timeout_fields.patch => 29_nginx-1.27.1-upstream_timeout_fields.patch} (100%)
rename images/nginx/rootfs/patches/{29_nginx-1.27.1-safe_resolver_ipv6_option.patch => 30_nginx-1.27.1-safe_resolver_ipv6_option.patch} (100%)
rename images/nginx/rootfs/patches/{30_nginx-1.27.1-socket_cloexec.patch => 31_nginx-1.27.1-socket_cloexec.patch} (100%)
rename images/nginx/rootfs/patches/{31_nginx-1.27.1-reuseport_close_unused_fds.patch => 32_nginx-1.27.1-reuseport_close_unused_fds.patch} (100%)
rename images/nginx/rootfs/patches/{32_nginx-1.27.1-proc_exit_handler.patch => 33_nginx-1.27.1-proc_exit_handler.patch} (100%)
create mode 100644 images/nginx/rootfs/patches/34_nginx-1.27.1-stream_proxy_protocol_v2.patch
diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh
index 45928c5e20..ddbbc2aa6b 100755
--- a/images/nginx/rootfs/build.sh
+++ b/images/nginx/rootfs/build.sh
@@ -32,20 +32,20 @@ export MORE_HEADERS_VERSION=v0.37
# Check for recent changes: https://github.com/atomx/nginx-http-auth-digest/compare/v1.0.0...master
export NGINX_DIGEST_AUTH=v1.0.0
-# Check for recent changes: https://github.com/SpiderLabs/ModSecurity-nginx/compare/v1.0.3...master
-export MODSECURITY_VERSION=v1.0.3
+# Check for recent changes: https://github.com/SpiderLabs/ModSecurity-nginx/compare/v1.0.4...master
+export MODSECURITY_VERSION=v1.0.4
# Check for recent changes: https://github.com/SpiderLabs/ModSecurity/compare/v3.0.14...v3/master
export MODSECURITY_LIB_VERSION=v3.0.14
-# Check for recent changes: https://github.com/coreruleset/coreruleset/compare/v4.10.0...main
-export OWASP_MODSECURITY_CRS_VERSION=v4.10.0
+# Check for recent changes: https://github.com/coreruleset/coreruleset/compare/v4.15.0...main
+export OWASP_MODSECURITY_CRS_VERSION=v4.15.0
-# Check for recent changes: https://github.com/openresty/lua-nginx-module/compare/v0.10.27...master
-export LUA_NGX_VERSION=v0.10.27
+# Check for recent changes: https://github.com/openresty/lua-nginx-module/compare/v0.10.28...master
+export LUA_NGX_VERSION=v0.10.28
-# Check for recent changes: https://github.com/openresty/stream-lua-nginx-module/compare/v0.0.15...master
-export LUA_STREAM_NGX_VERSION=v0.0.15
+# Check for recent changes: https://github.com/openresty/stream-lua-nginx-module/compare/v0.0.16...master
+export LUA_STREAM_NGX_VERSION=v0.0.16
# Check for recent changes: https://github.com/openresty/lua-upstream-nginx-module/compare/v0.07...master
export LUA_UPSTREAM_VERSION=v0.07
@@ -56,8 +56,8 @@ export LUA_CJSON_VERSION=2.1.0.14
# Check for recent changes: https://github.com/leev/ngx_http_geoip2_module/compare/445df24ef3781e488cee3dfe8a1e111997fc1dfe...master
export GEOIP2_VERSION=445df24ef3781e488cee3dfe8a1e111997fc1dfe
-# Check for recent changes: https://github.com/openresty/luajit2/compare/v2.1-20240815...v2.1-agentzh
-export LUAJIT_VERSION=v2.1-20240815
+# Check for recent changes: https://github.com/openresty/luajit2/compare/v2.1-20250117...v2.1-agentzh
+export LUAJIT_VERSION=v2.1-20250117
# Check for recent changes: https://github.com/openresty/lua-resty-balancer/compare/v0.05...master
export LUA_RESTY_BALANCER=v0.05
@@ -65,8 +65,8 @@ export LUA_RESTY_BALANCER=v0.05
# Check for recent changes: https://github.com/openresty/lua-resty-lrucache/compare/v0.15...master
export LUA_RESTY_CACHE=v0.15
-# Check for recent changes: https://github.com/openresty/lua-resty-core/compare/v0.1.30...master
-export LUA_RESTY_CORE=v0.1.30
+# Check for recent changes: https://github.com/openresty/lua-resty-core/compare/v0.1.31...master
+export LUA_RESTY_CORE=v0.1.31
# Check for recent changes: https://github.com/cloudflare/lua-resty-cookie/compare/f418d77082eaef48331302e84330488fdc810ef4...master
export LUA_RESTY_COOKIE_VERSION=f418d77082eaef48331302e84330488fdc810ef4
@@ -95,8 +95,8 @@ export LUA_RESTY_REDIS_VERSION=v0.31
# Check for recent changes: https://github.com/api7/lua-resty-ipmatcher/compare/3e93c53eb8c9884efe939ef070486a0e507cc5be...master
export LUA_RESTY_IPMATCHER_VERSION=3e93c53eb8c9884efe939ef070486a0e507cc5be
-# Check for recent changes: https://github.com/microsoft/mimalloc/compare/v2.1.9...master
-export MIMALOC_VERSION=v2.1.9
+# Check for recent changes: https://github.com/microsoft/mimalloc/compare/v2.2.4...main
+export MIMALOC_VERSION=v2.2.4
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp/compare/v1.18.0...main
export OPENTELEMETRY_CPP_VERSION=v1.18.0
@@ -104,8 +104,8 @@ export OPENTELEMETRY_CPP_VERSION=v1.18.0
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-proto/compare/v1.5.0...main
export OPENTELEMETRY_PROTO_VERSION=v1.5.0
-# Check for recent changes: https://github.com/nginx/njs/compare/0.8.10...master
-export NJS_VERSION=0.8.10
+# Check for recent changes: https://github.com/nginx/njs/compare/0.9.0...master
+export NJS_VERSION=0.9.0
export BUILD_PATH=/tmp/build
diff --git a/images/nginx/rootfs/patches/05_nginx-1.27.1-stream_ssl_preread_no_skip.patch b/images/nginx/rootfs/patches/05_nginx-1.27.1-stream_ssl_preread_no_skip.patch
index e45e9f69a7..b4fc7d67f8 100644
--- a/images/nginx/rootfs/patches/05_nginx-1.27.1-stream_ssl_preread_no_skip.patch
+++ b/images/nginx/rootfs/patches/05_nginx-1.27.1-stream_ssl_preread_no_skip.patch
@@ -1,10 +1,15 @@
diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c
-index e3d11fd9..3717b5fe 100644
+index 3fc83ff2f..7e65d65be 100644
--- a/src/stream/ngx_stream_ssl_preread_module.c
+++ b/src/stream/ngx_stream_ssl_preread_module.c
-@@ -159,7 +159,7 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
+@@ -190,11 +190,11 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
+ }
+
+ if (rc == NGX_OK) {
+- return ngx_stream_ssl_preread_servername(s, &ctx->host);
++ rc = ngx_stream_ssl_preread_servername(s, &ctx->host);
+ }
- rc = ngx_stream_ssl_preread_parse_record(ctx, p, p + len);
if (rc != NGX_AGAIN) {
- return rc;
+ return rc == NGX_OK ? NGX_DECLINED : rc;
diff --git a/images/nginx/rootfs/patches/28_nginx-1.27.1-CVE-2025-23419.patch b/images/nginx/rootfs/patches/28_nginx-1.27.1-CVE-2025-23419.patch
new file mode 100644
index 0000000000..dc692bfb9e
--- /dev/null
+++ b/images/nginx/rootfs/patches/28_nginx-1.27.1-CVE-2025-23419.patch
@@ -0,0 +1,87 @@
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+index 3cca57cf5..9593b7fb5 100644
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -932,6 +932,31 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
+ goto done;
+ }
+
++ sscf = ngx_http_get_module_srv_conf(cscf->ctx, ngx_http_ssl_module);
++
++#if (defined TLS1_3_VERSION \
++ && !defined LIBRESSL_VERSION_NUMBER && !defined OPENSSL_IS_BORINGSSL)
++
++ /*
++ * SSL_SESSION_get0_hostname() is only available in OpenSSL 1.1.1+,
++ * but servername being negotiated in every TLSv1.3 handshake
++ * is only returned in OpenSSL 1.1.1+ as well
++ */
++
++ if (sscf->verify) {
++ const char *hostname;
++
++ hostname = SSL_SESSION_get0_hostname(SSL_get0_session(ssl_conn));
++
++ if (hostname != NULL && ngx_strcmp(hostname, servername) != 0) {
++ c->ssl->handshake_rejected = 1;
++ *ad = SSL_AD_ACCESS_DENIED;
++ return SSL_TLSEXT_ERR_ALERT_FATAL;
++ }
++ }
++
++#endif
++
+ hc->ssl_servername = ngx_palloc(c->pool, sizeof(ngx_str_t));
+ if (hc->ssl_servername == NULL) {
+ goto error;
+@@ -945,8 +970,6 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
+
+ ngx_set_connection_log(c, clcf->error_log);
+
+- sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
+-
+ c->ssl->buffer_size = sscf->buffer_size;
+
+ if (sscf->ssl.ctx) {
+diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
+index ba444776a..6dee106de 100644
+--- a/src/stream/ngx_stream_ssl_module.c
++++ b/src/stream/ngx_stream_ssl_module.c
+@@ -521,12 +521,35 @@ ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
+ goto done;
+ }
+
++ sscf = ngx_stream_get_module_srv_conf(cscf->ctx, ngx_stream_ssl_module);
++
++#if (defined TLS1_3_VERSION \
++ && !defined LIBRESSL_VERSION_NUMBER && !defined OPENSSL_IS_BORINGSSL)
++
++ /*
++ * SSL_SESSION_get0_hostname() is only available in OpenSSL 1.1.1+,
++ * but servername being negotiated in every TLSv1.3 handshake
++ * is only returned in OpenSSL 1.1.1+ as well
++ */
++
++ if (sscf->verify) {
++ const char *hostname;
++
++ hostname = SSL_SESSION_get0_hostname(SSL_get0_session(ssl_conn));
++
++ if (hostname != NULL && ngx_strcmp(hostname, servername) != 0) {
++ c->ssl->handshake_rejected = 1;
++ *ad = SSL_AD_ACCESS_DENIED;
++ return SSL_TLSEXT_ERR_ALERT_FATAL;
++ }
++ }
++
++#endif
++
+ s->srv_conf = cscf->ctx->srv_conf;
+
+ ngx_set_connection_log(c, cscf->error_log);
+
+- sscf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
+-
+ if (sscf->ssl.ctx) {
+ if (SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx) == NULL) {
+ goto error;
diff --git a/images/nginx/rootfs/patches/28_nginx-1.27.1-upstream_timeout_fields.patch b/images/nginx/rootfs/patches/29_nginx-1.27.1-upstream_timeout_fields.patch
similarity index 100%
rename from images/nginx/rootfs/patches/28_nginx-1.27.1-upstream_timeout_fields.patch
rename to images/nginx/rootfs/patches/29_nginx-1.27.1-upstream_timeout_fields.patch
diff --git a/images/nginx/rootfs/patches/29_nginx-1.27.1-safe_resolver_ipv6_option.patch b/images/nginx/rootfs/patches/30_nginx-1.27.1-safe_resolver_ipv6_option.patch
similarity index 100%
rename from images/nginx/rootfs/patches/29_nginx-1.27.1-safe_resolver_ipv6_option.patch
rename to images/nginx/rootfs/patches/30_nginx-1.27.1-safe_resolver_ipv6_option.patch
diff --git a/images/nginx/rootfs/patches/30_nginx-1.27.1-socket_cloexec.patch b/images/nginx/rootfs/patches/31_nginx-1.27.1-socket_cloexec.patch
similarity index 100%
rename from images/nginx/rootfs/patches/30_nginx-1.27.1-socket_cloexec.patch
rename to images/nginx/rootfs/patches/31_nginx-1.27.1-socket_cloexec.patch
diff --git a/images/nginx/rootfs/patches/31_nginx-1.27.1-reuseport_close_unused_fds.patch b/images/nginx/rootfs/patches/32_nginx-1.27.1-reuseport_close_unused_fds.patch
similarity index 100%
rename from images/nginx/rootfs/patches/31_nginx-1.27.1-reuseport_close_unused_fds.patch
rename to images/nginx/rootfs/patches/32_nginx-1.27.1-reuseport_close_unused_fds.patch
diff --git a/images/nginx/rootfs/patches/32_nginx-1.27.1-proc_exit_handler.patch b/images/nginx/rootfs/patches/33_nginx-1.27.1-proc_exit_handler.patch
similarity index 100%
rename from images/nginx/rootfs/patches/32_nginx-1.27.1-proc_exit_handler.patch
rename to images/nginx/rootfs/patches/33_nginx-1.27.1-proc_exit_handler.patch
diff --git a/images/nginx/rootfs/patches/34_nginx-1.27.1-stream_proxy_protocol_v2.patch b/images/nginx/rootfs/patches/34_nginx-1.27.1-stream_proxy_protocol_v2.patch
new file mode 100644
index 0000000000..88d5e101d1
--- /dev/null
+++ b/images/nginx/rootfs/patches/34_nginx-1.27.1-stream_proxy_protocol_v2.patch
@@ -0,0 +1,630 @@
+diff --git a/src/core/ngx_proxy_protocol.c b/src/core/ngx_proxy_protocol.c
+index 49888b9..27c927e 100644
+--- a/src/core/ngx_proxy_protocol.c
++++ b/src/core/ngx_proxy_protocol.c
+@@ -12,6 +12,39 @@
+ #define NGX_PROXY_PROTOCOL_AF_INET 1
+ #define NGX_PROXY_PROTOCOL_AF_INET6 2
+
++#define NGX_PROXY_PROTOCOL_V2_SIG "\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A"
++#define NGX_PROXY_PROTOCOL_V2_SIG_LEN 12
++#define NGX_PROXY_PROTOCOL_V2_HDR_LEN 16
++#define NGX_PROXY_PROTOCOL_V2_HDR_LEN_INET \
++ (NGX_PROXY_PROTOCOL_V2_HDR_LEN + (4 + 4 + 2 + 2))
++#define NGX_PROXY_PROTOCOL_V2_HDR_LEN_INET6 \
++ (NGX_PROXY_PROTOCOL_V2_HDR_LEN + (16 + 16 + 2 + 2))
++
++#define NGX_PROXY_PROTOCOL_V2_CMD_PROXY (0x20 | 0x01)
++
++#define NGX_PROXY_PROTOCOL_V2_TRANS_STREAM 0x01
++
++#define NGX_PROXY_PROTOCOL_V2_FAM_UNSPEC 0x00
++#define NGX_PROXY_PROTOCOL_V2_FAM_INET 0x10
++#define NGX_PROXY_PROTOCOL_V2_FAM_INET6 0x20
++
++#define NGX_PROXY_PROTOCOL_V2_TYPE_ALPN 0x01
++#define NGX_PROXY_PROTOCOL_V2_TYPE_AUTHORITY 0x02 # Not implemented
++#define NGX_PROXY_PROTOCOL_V2_TYPE_CRC32C 0x03 # Not implemented
++#define NGX_PROXY_PROTOCOL_V2_TYPE_NOOP 0x04 # Not implemented
++#define NGX_PROXY_PROTOCOL_V2_TYPE_UNIQUE_ID 0x05 # Not implemented
++#define NGX_PROXY_PROTOCOL_V2_TYPE_SSL 0x20
++#define NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_VERSION 0x21
++#define NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_CN 0x22
++#define NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_CIPHER 0x23
++#define NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_SIG_ALG 0x24
++#define NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_KEY_ALG 0x25
++#define NGX_PROXY_PROTOCOL_V2_TYPE_NETNS 0x30 # Not implemented
++
++#define NGX_PROXY_PROTOCOL_V2_CLIENT_SSL 0x01
++#define NGX_PROXY_PROTOCOL_V2_CLIENT_CERT_CONN 0x02
++#define NGX_PROXY_PROTOCOL_V2_CLIENT_CERT_SESS 0x04
++
+
+ #define ngx_proxy_protocol_parse_uint16(p) \
+ ( ((uint16_t) (p)[0] << 8) \
+@@ -66,6 +99,53 @@ typedef struct {
+ } ngx_proxy_protocol_tlv_entry_t;
+
+
++typedef union {
++ struct {
++ uint32_t src_addr;
++ uint32_t dst_addr;
++ uint16_t src_port;
++ uint16_t dst_port;
++ } ip4;
++ struct {
++ uint8_t src_addr[16];
++ uint8_t dst_addr[16];
++ uint16_t src_port;
++ uint16_t dst_port;
++ } ip6;
++} ngx_proxy_protocol_addrs_t;
++
++
++typedef struct {
++ u_char signature[12];
++ uint8_t version_command;
++ uint8_t family_transport;
++ uint16_t len;
++ ngx_proxy_protocol_addrs_t addr;
++} ngx_proxy_protocol_v2_header_t;
++
++
++struct ngx_tlv_s {
++ uint8_t type;
++ uint8_t length_hi;
++ uint8_t length_lo;
++ uint8_t value[0];
++} __attribute__((packed));
++
++typedef struct ngx_tlv_s ngx_tlv_t;
++
++
++#if (NGX_STREAM_SSL)
++struct ngx_tlv_ssl_s {
++ ngx_tlv_t tlv;
++ uint8_t client;
++ uint32_t verify;
++ uint8_t sub_tlv[];
++} __attribute__((packed));
++
++typedef struct ngx_tlv_ssl_s ngx_tlv_ssl_t;
++#endif
++
++
+ static u_char *ngx_proxy_protocol_read_addr(ngx_connection_t *c, u_char *p,
+ u_char *last, ngx_str_t *addr);
+ static u_char *ngx_proxy_protocol_read_port(u_char *p, u_char *last,
+@@ -74,6 +154,15 @@ static u_char *ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf,
+ u_char *last);
+ static ngx_int_t ngx_proxy_protocol_lookup_tlv(ngx_connection_t *c,
+ ngx_str_t *tlvs, ngx_uint_t type, ngx_str_t *value);
++static u_char *ngx_proxy_protocol_v2_write(ngx_connection_t *c, u_char *buf,
++ u_char *last);
++#if (NGX_HAVE_INET6)
++static void ngx_v4tov6(struct in6_addr *sin6_addr, struct sockaddr *addr);
++#endif
++#if (NGX_STREAM_SSL)
++static u_char *ngx_copy_tlv(u_char *pos, u_char *last, u_char type,
++ u_char *value, uint16_t value_len);
++#endif
+
+
+ static ngx_proxy_protocol_tlv_entry_t ngx_proxy_protocol_tlv_entries[] = {
+@@ -277,7 +366,8 @@ ngx_proxy_protocol_read_port(u_char *p, u_char *last, in_port_t *port,
+
+
+ u_char *
+-ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last)
++ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last,
++ ngx_uint_t pp_version)
+ {
+ ngx_uint_t port, lport;
+
+@@ -291,6 +381,10 @@ ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last)
+ return NULL;
+ }
+
++ if (pp_version == 2) {
++ return ngx_proxy_protocol_v2_write(c, buf, last);
++ }
++
+ switch (c->sockaddr->sa_family) {
+
+ case AF_INET:
+@@ -612,3 +706,360 @@ ngx_proxy_protocol_lookup_tlv(ngx_connection_t *c, ngx_str_t *tlvs,
+
+ return NGX_DECLINED;
+ }
++
++
++static u_char *
++ngx_proxy_protocol_v2_write(ngx_connection_t *c, u_char *buf, u_char *last)
++{
++ struct sockaddr *src, *dst;
++ ngx_proxy_protocol_v2_header_t *header;
++#if (NGX_HAVE_INET6)
++ struct in6_addr v6_tmp;
++ ngx_int_t v6_used;
++#endif
++#if (NGX_STREAM_SSL)
++ ngx_tlv_ssl_t *tlv;
++ u_char *value, *pos;
++ u_char kbuf[100];
++ const unsigned char *data;
++ unsigned int data_len;
++
++ X509 *crt;
++ EVP_PKEY *key;
++ const ASN1_OBJECT *algorithm;
++ const char *s;
++
++ long rc;
++ size_t tlv_len;
++#endif
++ size_t len;
++
++ header = (ngx_proxy_protocol_v2_header_t *) buf;
++
++ header->len = 0;
++
++ src = c->sockaddr;
++ dst = c->local_sockaddr;
++
++ len = 0;
++
++#if (NGX_HAVE_INET6)
++ v6_used = 0;
++#endif
++
++ ngx_memcpy(header->signature, NGX_PROXY_PROTOCOL_V2_SIG,
++ NGX_PROXY_PROTOCOL_V2_SIG_LEN);
++
++ header->version_command = NGX_PROXY_PROTOCOL_V2_CMD_PROXY;
++ header->family_transport = NGX_PROXY_PROTOCOL_V2_TRANS_STREAM;
++
++ /** Addrs */
++
++ switch (src->sa_family) {
++
++ case AF_INET:
++
++ if (dst->sa_family == AF_INET) {
++
++ header->addr.ip4.src_addr =
++ ((struct sockaddr_in *) src)->sin_addr.s_addr;
++ header->addr.ip4.src_port = ((struct sockaddr_in *) src)->sin_port;
++ }
++#if (NGX_HAVE_INET6)
++ else /** dst == AF_INET6 */{
++
++ ngx_v4tov6(&v6_tmp, src);
++ ngx_memcpy(header->addr.ip6.src_addr, &v6_tmp, 16);
++ header->addr.ip6.src_port = ((struct sockaddr_in *) src)->sin_port;
++ }
++#endif
++ break;
++
++#if (NGX_HAVE_INET6)
++ case AF_INET6:
++ v6_used = 1;
++
++ ngx_memcpy(header->addr.ip6.src_addr,
++ &((struct sockaddr_in6 *) src)->sin6_addr, 16);
++ header->addr.ip6.src_port = ((struct sockaddr_in6 *) src)->sin6_port;
++
++ break;
++#endif
++
++ default:
++ ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
++ "PROXY protocol v2 unsupported src address family %ui",
++ src->sa_family);
++ goto unspec;
++ };
++
++ switch (dst->sa_family) {
++ case AF_INET:
++
++ if (src->sa_family == AF_INET) {
++
++ header->addr.ip4.dst_addr =
++ ((struct sockaddr_in *) dst)->sin_addr.s_addr;
++ header->addr.ip4.dst_port = ((struct sockaddr_in *) dst)->sin_port;
++ }
++#if (NGX_HAVE_INET6)
++ else /** src == AF_INET6 */{
++
++ ngx_v4tov6(&v6_tmp, dst);
++ ngx_memcpy(header->addr.ip6.dst_addr, &v6_tmp, 16);
++ header->addr.ip6.dst_port = ((struct sockaddr_in *) dst)->sin_port;
++
++ }
++#endif
++ break;
++
++#if (NGX_HAVE_INET6)
++ case AF_INET6:
++ v6_used = 1;
++
++ ngx_memcpy(header->addr.ip6.dst_addr,
++ &((struct sockaddr_in6 *) dst)->sin6_addr, 16);
++ header->addr.ip6.dst_port = ((struct sockaddr_in6 *) dst)->sin6_port;
++
++ break;
++#endif
++
++ default:
++ ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
++ "PROXY protocol v2 unsupported dest address family %ui",
++ dst->sa_family);
++ goto unspec;
++ }
++
++#if (NGX_HAVE_INET6)
++ if (!v6_used) {
++ header->family_transport |= NGX_PROXY_PROTOCOL_V2_FAM_INET;
++ len = NGX_PROXY_PROTOCOL_V2_HDR_LEN_INET;
++
++ } else {
++ header->family_transport |= NGX_PROXY_PROTOCOL_V2_FAM_INET6;
++ len = NGX_PROXY_PROTOCOL_V2_HDR_LEN_INET6;
++
++ }
++#else
++ header->family_transport |= NGX_PROXY_PROTOCOL_V2_FAM_INET;
++ len = NGX_PROXY_PROTOCOL_V2_HDR_LEN_INET;
++#endif
++
++ /** SSL TLVs */
++#if (NGX_STREAM_SSL)
++
++ if (c->ssl != NULL) {
++
++ data = NULL;
++ data_len = 0;
++
++ tlv = (ngx_tlv_ssl_t *) (buf + len);
++ ngx_memzero(tlv, sizeof(ngx_tlv_ssl_t));
++
++ tlv->tlv.type = NGX_PROXY_PROTOCOL_V2_TYPE_SSL;
++ pos = buf + len + sizeof(ngx_tlv_ssl_t);
++
++ tlv->client |= NGX_PROXY_PROTOCOL_V2_CLIENT_SSL;
++
++#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
++ SSL_get0_alpn_selected(c->ssl->connection, &data, &data_len);
++
++#ifdef TLSEXT_TYPE_next_proto_neg
++ if (data_len == 0) {
++ SSL_get0_next_proto_negotiated(c->ssl->connection,
++ &data, &data_len);
++ }
++#endif
++
++#else /* TLSEXT_TYPE_next_proto_neg */
++ SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &data_len);
++#endif
++
++ if (data_len) {
++
++ pos = ngx_copy_tlv(pos, last,
++ NGX_PROXY_PROTOCOL_V2_TYPE_ALPN,
++ (u_char *) data, (uint16_t) data_len);
++ if (pos == NULL) {
++ return NULL;
++ }
++ }
++
++ value = (u_char *) SSL_get_version(c->ssl->connection);
++ if (value != NULL) {
++
++ pos = ngx_copy_tlv(pos, last,
++ NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_VERSION,
++ value, ngx_strlen(value));
++ if (pos == NULL) {
++ return NULL;
++ }
++ }
++
++ crt = SSL_get0_peer_certificate(c->ssl->connection);
++ if (crt != NULL) {
++ tlv->client |= NGX_PROXY_PROTOCOL_V2_CLIENT_CERT_SESS;
++
++ rc = SSL_get_verify_result(c->ssl->connection);
++ tlv->verify = htonl(rc);
++
++ if (rc == X509_V_OK) {
++ if (ngx_ssl_ocsp_get_status(c, &s) == NGX_OK) {
++ tlv->client |= NGX_PROXY_PROTOCOL_V2_CLIENT_CERT_CONN;
++ }
++ }
++
++ X509_NAME *subject_name_value = X509_get_subject_name(crt);
++ if(subject_name_value != NULL) {
++ int nid = OBJ_txt2nid("CN");
++ int index = X509_NAME_get_index_by_NID(subject_name_value, nid, -1);
++
++ X509_NAME_ENTRY *subject_name_cn_entry = X509_NAME_get_entry(subject_name_value, index);
++ if (subject_name_cn_entry) {
++ ASN1_STRING *subject_name_cn_data_asn1 = X509_NAME_ENTRY_get_data(subject_name_cn_entry);
++
++ if (subject_name_cn_data_asn1 != NULL) {
++ value = (u_char *) ASN1_STRING_get0_data(subject_name_cn_data_asn1);
++ if(value != NULL) {
++ pos = ngx_copy_tlv(pos, last,
++ NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_CN,
++ value, ngx_strlen(value));
++ if (pos == NULL) {
++ return NULL;
++ }
++ }
++ }
++ }
++ }
++ }
++
++
++ crt = SSL_get_certificate(c->ssl->connection);
++ if (crt != NULL) {
++ key = X509_get_pubkey(crt);
++
++ /** Key */
++ if (key != NULL) {
++ switch (EVP_PKEY_base_id(key)) {
++ case EVP_PKEY_RSA:
++ value = (u_char *) "RSA";
++ break;
++ case EVP_PKEY_EC:
++ value = (u_char *) "EC";
++ break;
++ case EVP_PKEY_DSA:
++ value = (u_char *) "DSA";
++ break;
++ default:
++ value = NULL;
++ break;
++ }
++
++ if (value != NULL) {
++ value = ngx_snprintf(kbuf, sizeof(kbuf) - 1, "%s%d%Z",
++ value, EVP_PKEY_bits(key));
++
++ pos = ngx_copy_tlv(pos, last,
++ NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_KEY_ALG,
++ kbuf, ngx_strlen(kbuf));
++ }
++
++ EVP_PKEY_free(key);
++
++ if (pos == NULL) {
++ return NULL;
++ }
++ }
++
++ /* ALG */
++ X509_ALGOR_get0(&algorithm, NULL, NULL, X509_get0_tbs_sigalg(crt));
++ value = (u_char *) OBJ_nid2sn(OBJ_obj2nid(algorithm));
++
++ if (value != NULL) {
++
++ pos = ngx_copy_tlv(pos, last,
++ NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_SIG_ALG,
++ value, ngx_strlen(value));
++ if (pos == NULL) {
++ return NULL;
++ }
++ }
++ }
++
++ value = (u_char *) SSL_get_cipher_name(c->ssl->connection);
++ if (value != NULL) {
++
++ pos = ngx_copy_tlv(pos, last,
++ NGX_PROXY_PROTOCOL_V2_SUBTYPE_SSL_CIPHER,
++ value, ngx_strlen(value));
++ if (pos == NULL) {
++ return NULL;
++ }
++ }
++
++ tlv_len = pos - (buf + len);
++
++ tlv->tlv.length_hi = (uint16_t) (tlv_len - sizeof(ngx_tlv_t)) >> 8;
++ tlv->tlv.length_lo = (uint16_t) (tlv_len - sizeof(ngx_tlv_t)) & 0x00ff;
++
++ len = len + tlv_len;
++ }
++
++#endif
++
++ header->len = htons(len - NGX_PROXY_PROTOCOL_V2_HDR_LEN);
++ return buf + len;
++
++unspec:
++ header->family_transport |= NGX_PROXY_PROTOCOL_V2_FAM_UNSPEC;
++ header->len = 0;
++
++ return buf + NGX_PROXY_PROTOCOL_V2_HDR_LEN;
++}
++
++
++#if (NGX_HAVE_INET6)
++static void
++ngx_v4tov6(struct in6_addr *sin6_addr, struct sockaddr *addr)
++{
++ static const char rfc4291[] = { 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0xFF, 0xFF };
++
++ struct in_addr tmp_addr, *sin_addr;
++
++ sin_addr = &((struct sockaddr_in *) addr)->sin_addr;
++
++ tmp_addr.s_addr = sin_addr->s_addr;
++ ngx_memcpy(sin6_addr->s6_addr, rfc4291, sizeof(rfc4291));
++ ngx_memcpy(sin6_addr->s6_addr + 12, &tmp_addr.s_addr, 4);
++}
++#endif
++
++
++#if (NGX_STREAM_SSL)
++
++static u_char *
++ngx_copy_tlv(u_char *pos, u_char *last, u_char type,
++ u_char *value, uint16_t value_len)
++{
++ ngx_tlv_t *tlv;
++
++ if (last - pos < (long) sizeof(*tlv)) {
++ return NULL;
++ }
++
++ tlv = (ngx_tlv_t *) pos;
++
++ tlv->type = type;
++ tlv->length_hi = (uint16_t) value_len >> 8;
++ tlv->length_lo = (uint16_t) value_len & 0x00ff;
++ ngx_memcpy(tlv->value, value, value_len);
++
++ return pos + (value_len + sizeof(*tlv));
++}
++
++#endif
++
++
+diff --git a/src/core/ngx_proxy_protocol.h b/src/core/ngx_proxy_protocol.h
+index d1749f5..bc2e0a2 100644
+--- a/src/core/ngx_proxy_protocol.h
++++ b/src/core/ngx_proxy_protocol.h
+@@ -29,7 +29,7 @@ struct ngx_proxy_protocol_s {
+ u_char *ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf,
+ u_char *last);
+ u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf,
+- u_char *last);
++ u_char *last, ngx_uint_t pp_version);
+ ngx_int_t ngx_proxy_protocol_get_tlv(ngx_connection_t *c, ngx_str_t *name,
+ ngx_str_t *value);
+
+diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
+index 82dca1e..0279866 100644
+--- a/src/stream/ngx_stream_proxy_module.c
++++ b/src/stream/ngx_stream_proxy_module.c
+@@ -30,7 +30,7 @@ typedef struct {
+ ngx_uint_t responses;
+ ngx_uint_t next_upstream_tries;
+ ngx_flag_t next_upstream;
+- ngx_flag_t proxy_protocol;
++ ngx_uint_t proxy_protocol;
+ ngx_flag_t half_close;
+ ngx_stream_upstream_local_t *local;
+ ngx_flag_t socket_keepalive;
+@@ -125,6 +125,14 @@ static ngx_conf_post_t ngx_stream_proxy_ssl_conf_command_post =
+ #endif
+
+
++static ngx_conf_enum_t ngx_stream_proxy_protocol[] = {
++ { ngx_string("off"), 0 },
++ { ngx_string("on"), 1 },
++ { ngx_string("v2"), 2 },
++ { ngx_null_string, 0 }
++};
++
++
+ static ngx_conf_deprecated_t ngx_conf_deprecated_proxy_downstream_buffer = {
+ ngx_conf_deprecated, "proxy_downstream_buffer", "proxy_buffer_size"
+ };
+@@ -243,10 +251,10 @@ static ngx_command_t ngx_stream_proxy_commands[] = {
+
+ { ngx_string("proxy_protocol"),
+ NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
+- ngx_conf_set_flag_slot,
++ ngx_conf_set_enum_slot,
+ NGX_STREAM_SRV_CONF_OFFSET,
+ offsetof(ngx_stream_proxy_srv_conf_t, proxy_protocol),
+- NULL },
++ &ngx_stream_proxy_protocol },
+
+ { ngx_string("proxy_half_close"),
+ NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
+@@ -914,7 +922,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
+ return;
+ }
+
+- p = ngx_pnalloc(c->pool, NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
++ p = ngx_pnalloc(c->pool, NGX_PROXY_PROTOCOL_MAX_HEADER);
+ if (p == NULL) {
+ ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+ return;
+@@ -922,8 +930,8 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
+
+ cl->buf->pos = p;
+
+- p = ngx_proxy_protocol_write(c, p,
+- p + NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
++ p = ngx_proxy_protocol_write(c, p, p + NGX_PROXY_PROTOCOL_MAX_HEADER,
++ u->proxy_protocol);
+ if (p == NULL) {
+ ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+ return;
+@@ -963,7 +971,7 @@ static ngx_int_t
+ ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
+ {
+ u_char *p;
+- u_char buf[NGX_PROXY_PROTOCOL_V1_MAX_HEADER];
++ u_char buf[NGX_PROXY_PROTOCOL_MAX_HEADER];
+ ssize_t n, size;
+ ngx_connection_t *c, *pc;
+ ngx_stream_upstream_t *u;
+@@ -976,15 +984,15 @@ ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
+ ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
+ "stream proxy send PROXY protocol header");
+
+- p = ngx_proxy_protocol_write(c, buf,
+- buf + NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
++ u = s->upstream;
++
++ p = ngx_proxy_protocol_write(c, buf, buf + NGX_PROXY_PROTOCOL_MAX_HEADER,
++ u->proxy_protocol);
+ if (p == NULL) {
+ ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+ return NGX_ERROR;
+ }
+
+- u = s->upstream;
+-
+ pc = u->peer.connection;
+
+ size = p - buf;
+@@ -2116,7 +2124,7 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
+ conf->responses = NGX_CONF_UNSET_UINT;
+ conf->next_upstream_tries = NGX_CONF_UNSET_UINT;
+ conf->next_upstream = NGX_CONF_UNSET;
+- conf->proxy_protocol = NGX_CONF_UNSET;
++ conf->proxy_protocol = NGX_CONF_UNSET_UINT;
+ conf->local = NGX_CONF_UNSET_PTR;
+ conf->socket_keepalive = NGX_CONF_UNSET;
+ conf->half_close = NGX_CONF_UNSET;
+@@ -2171,7 +2179,7 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+
+ ngx_conf_merge_value(conf->next_upstream, prev->next_upstream, 1);
+
+- ngx_conf_merge_value(conf->proxy_protocol, prev->proxy_protocol, 0);
++ ngx_conf_merge_uint_value(conf->proxy_protocol, prev->proxy_protocol, 0);
+
+ ngx_conf_merge_ptr_value(conf->local, prev->local, NULL);
+
+diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
+index 25433d6..6df11df 100644
+--- a/src/stream/ngx_stream_upstream.h
++++ b/src/stream/ngx_stream_upstream.h
+@@ -141,7 +141,7 @@ typedef struct {
+ ngx_stream_upstream_resolved_t *resolved;
+ ngx_stream_upstream_state_t *state;
+ unsigned connected:1;
+- unsigned proxy_protocol:1;
++ unsigned proxy_protocol:2;
+ unsigned half_closed:1;
+ } ngx_stream_upstream_t;
+
From 8da05a5a107a3596778ad46f4ea209fcb99ec062 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Mon, 23 Jun 2025 10:48:53 +0200
Subject: [PATCH 021/361] CI: Update Kubernetes to v1.33.2. (#13539)
---
.github/workflows/ci.yaml | 2 +-
images/test-runner/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 939fbf3102..dbba27fe27 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -172,7 +172,7 @@ jobs:
- name: Prepare Host
run: |
- curl -LO https://dl.k8s.io/release/v1.33.1/bin/linux/amd64/kubectl
+ curl -LO https://dl.k8s.io/release/v1.33.2/bin/linux/amd64/kubectl
chmod +x ./kubectl
sudo mv ./kubectl /usr/local/bin/kubectl
diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile
index fdf99f923f..d861cd7cd5 100644
--- a/images/test-runner/Makefile
+++ b/images/test-runner/Makefile
@@ -35,7 +35,7 @@ build: builder
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
--build-arg GOLANG_VERSION=$(GOLANG_VERSION) \
--build-arg ETCD_VERSION=3.5.13-0 \
- --build-arg K8S_RELEASE=v1.33.1 \
+ --build-arg K8S_RELEASE=v1.33.2 \
--build-arg RESTY_CLI_VERSION=0.27 \
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
--build-arg LUAROCKS_VERSION=v3.12.0 \
From b299406898b1ded8e4a8682df774dc64d25f797f Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Mon, 23 Jun 2025 11:58:53 +0200
Subject: [PATCH 022/361] Go: Update dependencies. (#13542)
---
go.mod | 20 +++++-----
go.sum | 40 +++++++++----------
images/custom-error-pages/rootfs/go.mod | 2 +-
images/custom-error-pages/rootfs/go.sum | 4 +-
images/ext-auth-example-authsvc/rootfs/go.mod | 2 +-
images/ext-auth-example-authsvc/rootfs/go.sum | 4 +-
images/go-grpc-greeter-server/rootfs/go.mod | 2 +-
images/go-grpc-greeter-server/rootfs/go.sum | 4 +-
images/kube-webhook-certgen/rootfs/go.mod | 8 ++--
images/kube-webhook-certgen/rootfs/go.sum | 16 ++++----
10 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/go.mod b/go.mod
index f5dae780c3..23b83112de 100644
--- a/go.mod
+++ b/go.mod
@@ -18,11 +18,11 @@ require (
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
github.com/ncabatoff/process-exporter v0.8.7
github.com/onsi/ginkgo/v2 v2.23.4
- github.com/opencontainers/cgroups v0.0.2
+ github.com/opencontainers/cgroups v0.0.3
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
github.com/prometheus/client_golang v1.22.0
github.com/prometheus/client_model v0.6.2
- github.com/prometheus/common v0.64.0
+ github.com/prometheus/common v0.65.0
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0
@@ -33,14 +33,14 @@ require (
google.golang.org/grpc v1.73.0
gopkg.in/go-playground/pool.v3 v3.1.1
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
- k8s.io/api v0.33.1
- k8s.io/apiextensions-apiserver v0.33.1
- k8s.io/apimachinery v0.33.1
- k8s.io/apiserver v0.33.1
- k8s.io/cli-runtime v0.33.1
- k8s.io/client-go v0.33.1
- k8s.io/code-generator v0.33.1
- k8s.io/component-base v0.33.1
+ k8s.io/api v0.33.2
+ k8s.io/apiextensions-apiserver v0.33.2
+ k8s.io/apimachinery v0.33.2
+ k8s.io/apiserver v0.33.2
+ k8s.io/cli-runtime v0.33.2
+ k8s.io/client-go v0.33.2
+ k8s.io/code-generator v0.33.2
+ k8s.io/component-base v0.33.2
k8s.io/klog/v2 v2.130.1
pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732
sigs.k8s.io/controller-runtime v0.21.0
diff --git a/go.sum b/go.sum
index 030ef9053a..ac37eb2dad 100644
--- a/go.sum
+++ b/go.sum
@@ -172,8 +172,8 @@ github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOT
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
-github.com/opencontainers/cgroups v0.0.2 h1:A+mAPPMfgKNCEZUUtibESFx06uvhAmvo8sSz3Abwk7o=
-github.com/opencontainers/cgroups v0.0.2/go.mod h1:s8lktyhlGUqM7OSRL5P7eAW6Wb+kWPNvt4qvVfzA5vs=
+github.com/opencontainers/cgroups v0.0.3 h1:Jc9dWh/0YLGjdy6J/9Ln8NM5BfTA4W2BY0GMozy3aDU=
+github.com/opencontainers/cgroups v0.0.3/go.mod h1:s8lktyhlGUqM7OSRL5P7eAW6Wb+kWPNvt4qvVfzA5vs=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -187,8 +187,8 @@ github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.64.0 h1:pdZeA+g617P7oGv1CzdTzyeShxAGrTBsolKNOLQPGO4=
-github.com/prometheus/common v0.64.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
+github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
+github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@@ -336,22 +336,22 @@ gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
-k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
-k8s.io/apiextensions-apiserver v0.33.1 h1:N7ccbSlRN6I2QBcXevB73PixX2dQNIW0ZRuguEE91zI=
-k8s.io/apiextensions-apiserver v0.33.1/go.mod h1:uNQ52z1A1Gu75QSa+pFK5bcXc4hq7lpOXbweZgi4dqA=
-k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
-k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/apiserver v0.33.1 h1:yLgLUPDVC6tHbNcw5uE9mo1T6ELhJj7B0geifra3Qdo=
-k8s.io/apiserver v0.33.1/go.mod h1:VMbE4ArWYLO01omz+k8hFjAdYfc3GVAYPrhP2tTKccs=
-k8s.io/cli-runtime v0.33.1 h1:TvpjEtF71ViFmPeYMj1baZMJR4iWUEplklsUQ7D3quA=
-k8s.io/cli-runtime v0.33.1/go.mod h1:9dz5Q4Uh8io4OWCLiEf/217DXwqNgiTS/IOuza99VZE=
-k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
-k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
-k8s.io/code-generator v0.33.1 h1:ZLzIRdMsh3Myfnx9BaooX6iQry29UJjVfVG+BuS+UMw=
-k8s.io/code-generator v0.33.1/go.mod h1:HUKT7Ubp6bOgIbbaPIs9lpd2Q02uqkMCMx9/GjDrWpY=
-k8s.io/component-base v0.33.1 h1:EoJ0xA+wr77T+G8p6T3l4efT2oNwbqBVKR71E0tBIaI=
-k8s.io/component-base v0.33.1/go.mod h1:guT/w/6piyPfTgq7gfvgetyXMIh10zuXA6cRRm3rDuY=
+k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
+k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
+k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8=
+k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8=
+k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
+k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/apiserver v0.33.2 h1:KGTRbxn2wJagJowo29kKBp4TchpO1DRO3g+dB/KOJN4=
+k8s.io/apiserver v0.33.2/go.mod h1:9qday04wEAMLPWWo9AwqCZSiIn3OYSZacDyu/AcoM/M=
+k8s.io/cli-runtime v0.33.2 h1:koNYQKSDdq5AExa/RDudXMhhtFasEg48KLS2KSAU74Y=
+k8s.io/cli-runtime v0.33.2/go.mod h1:gnhsAWpovqf1Zj5YRRBBU7PFsRc6NkEkwYNQE+mXL88=
+k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
+k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
+k8s.io/code-generator v0.33.2 h1:PCJ0Y6viTCxxJHMOyGqYwWEteM4q6y1Hqo2rNpl6jF4=
+k8s.io/code-generator v0.33.2/go.mod h1:hBjCA9kPMpjLWwxcr75ReaQfFXY8u+9bEJJ7kRw3J8c=
+k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0=
+k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k=
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 h1:2OX19X59HxDprNCVrWi6jb7LW1PoqTlYqEq5H2oetog=
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
k8s.io/helm v2.17.0+incompatible h1:Bpn6o1wKLYqKM3+Osh8e+1/K2g/GsQJ4F4yNF2+deao=
diff --git a/images/custom-error-pages/rootfs/go.mod b/images/custom-error-pages/rootfs/go.mod
index 9e5cabd6be..1c8aa41af5 100644
--- a/images/custom-error-pages/rootfs/go.mod
+++ b/images/custom-error-pages/rootfs/go.mod
@@ -9,7 +9,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
- github.com/prometheus/common v0.64.0 // indirect
+ github.com/prometheus/common v0.65.0 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
golang.org/x/sys v0.33.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
diff --git a/images/custom-error-pages/rootfs/go.sum b/images/custom-error-pages/rootfs/go.sum
index 9ae5774100..884c28cd3b 100644
--- a/images/custom-error-pages/rootfs/go.sum
+++ b/images/custom-error-pages/rootfs/go.sum
@@ -18,8 +18,8 @@ github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.64.0 h1:pdZeA+g617P7oGv1CzdTzyeShxAGrTBsolKNOLQPGO4=
-github.com/prometheus/common v0.64.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
+github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
+github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
diff --git a/images/ext-auth-example-authsvc/rootfs/go.mod b/images/ext-auth-example-authsvc/rootfs/go.mod
index b0a125097f..346ef33968 100644
--- a/images/ext-auth-example-authsvc/rootfs/go.mod
+++ b/images/ext-auth-example-authsvc/rootfs/go.mod
@@ -2,6 +2,6 @@ module k8s.io/ingress-nginx/ext-auth-example-authsvc
go 1.24.4
-require k8s.io/apimachinery v0.33.1
+require k8s.io/apimachinery v0.33.2
require github.com/google/uuid v1.6.0 // indirect
diff --git a/images/ext-auth-example-authsvc/rootfs/go.sum b/images/ext-auth-example-authsvc/rootfs/go.sum
index 81b98923ca..2dfc291dca 100644
--- a/images/ext-auth-example-authsvc/rootfs/go.sum
+++ b/images/ext-auth-example-authsvc/rootfs/go.sum
@@ -1,4 +1,4 @@
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
-k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
+k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
diff --git a/images/go-grpc-greeter-server/rootfs/go.mod b/images/go-grpc-greeter-server/rootfs/go.mod
index 496a8d3357..1f4a1902d4 100644
--- a/images/go-grpc-greeter-server/rootfs/go.mod
+++ b/images/go-grpc-greeter-server/rootfs/go.mod
@@ -4,7 +4,7 @@ go 1.24.4
require (
google.golang.org/grpc v1.73.0
- google.golang.org/grpc/examples v0.0.0-20250611162622-57400b4e6918
+ google.golang.org/grpc/examples v0.0.0-20250623054635-bdbe6a2b5d8d
)
require (
diff --git a/images/go-grpc-greeter-server/rootfs/go.sum b/images/go-grpc-greeter-server/rootfs/go.sum
index 3e1eed20f5..dee4708091 100644
--- a/images/go-grpc-greeter-server/rootfs/go.sum
+++ b/images/go-grpc-greeter-server/rootfs/go.sum
@@ -30,7 +30,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
-google.golang.org/grpc/examples v0.0.0-20250611162622-57400b4e6918 h1:bBfndLYT4aIDLTM+t67TS5++5BjCRfLeJsOJmwoeNdM=
-google.golang.org/grpc/examples v0.0.0-20250611162622-57400b4e6918/go.mod h1:LEu4MhKupt/g4nRi+hCu5zfi4M84eGk0vBQLQKs9y9U=
+google.golang.org/grpc/examples v0.0.0-20250623054635-bdbe6a2b5d8d h1:KTBpPCXkzYZY1oClOiUFFRChUbWribmDYjp7uBZZgv4=
+google.golang.org/grpc/examples v0.0.0-20250623054635-bdbe6a2b5d8d/go.mod h1:LEu4MhKupt/g4nRi+hCu5zfi4M84eGk0vBQLQKs9y9U=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
diff --git a/images/kube-webhook-certgen/rootfs/go.mod b/images/kube-webhook-certgen/rootfs/go.mod
index bb3163ae5f..749c198b1e 100644
--- a/images/kube-webhook-certgen/rootfs/go.mod
+++ b/images/kube-webhook-certgen/rootfs/go.mod
@@ -6,10 +6,10 @@ require (
github.com/onrik/logrus v0.11.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.9.1
- k8s.io/api v0.33.1
- k8s.io/apimachinery v0.33.1
- k8s.io/client-go v0.33.1
- k8s.io/kube-aggregator v0.33.1
+ k8s.io/api v0.33.2
+ k8s.io/apimachinery v0.33.2
+ k8s.io/client-go v0.33.2
+ k8s.io/kube-aggregator v0.33.2
)
require (
diff --git a/images/kube-webhook-certgen/rootfs/go.sum b/images/kube-webhook-certgen/rootfs/go.sum
index 4d6f390284..276f7fa92d 100644
--- a/images/kube-webhook-certgen/rootfs/go.sum
+++ b/images/kube-webhook-certgen/rootfs/go.sum
@@ -140,16 +140,16 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
-k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
-k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
-k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
-k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
+k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
+k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
+k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
+k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
+k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-aggregator v0.33.1 h1:PigQUqAvd6Y4hBjQAqhKz3lEJC2VHLL4bSOEuS06a40=
-k8s.io/kube-aggregator v0.33.1/go.mod h1:16/wlU5Lj7hNJSv7JSu5FLvxyrgiJVLCHzfVoECAsuI=
+k8s.io/kube-aggregator v0.33.2 h1:eMW63PNucP+3UxnwYcfn5Yt2w2Sj2jI+imA7UWkYHVc=
+k8s.io/kube-aggregator v0.33.2/go.mod h1:qQbliLwcdmx7/8mtvkc/9QV/ON2M6ZBMcffEUmrqKFw=
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
From 93dbaad606cab4d8476583b49d27b0bb21b7486f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Jun 2025 13:12:28 -0700
Subject: [PATCH 023/361] Bump docker/setup-buildx-action from 3.10.0 to 3.11.1
in the actions group (#13545)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/ci.yaml | 2 +-
.github/workflows/images.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index dbba27fe27..2238963c33 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -163,7 +163,7 @@ jobs:
- name: Set up Docker Buildx
id: buildx
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+ uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
with:
version: latest
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index e28604ba20..e3a4168e10 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -178,7 +178,7 @@ jobs:
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
- name: Set up Docker Buildx
id: buildx
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+ uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
with:
version: latest
platforms: ${{ env.PLATFORMS }}
From a8e6de7488dd27d1ed09465cc51e3ad7c950eabd Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Wed, 25 Jun 2025 10:34:31 +0200
Subject: [PATCH 024/361] Go: Update dependencies. (#13548)
---
go.mod | 4 ++--
go.sum | 12 ++++++------
images/go-grpc-greeter-server/rootfs/go.mod | 2 +-
images/go-grpc-greeter-server/rootfs/go.sum | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/go.mod b/go.mod
index 23b83112de..db26976730 100644
--- a/go.mod
+++ b/go.mod
@@ -57,8 +57,8 @@ require (
github.com/google/go-querystring v1.1.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
- go.opentelemetry.io/otel v1.36.0 // indirect
- go.opentelemetry.io/otel/trace v1.36.0 // indirect
+ go.opentelemetry.io/otel v1.37.0 // indirect
+ go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index ac37eb2dad..83c7063cc9 100644
--- a/go.sum
+++ b/go.sum
@@ -232,16 +232,16 @@ github.com/zakjan/cert-chain-resolver v0.0.0-20221221105603-fcedb00c5b30 h1:rzHv
github.com/zakjan/cert-chain-resolver v0.0.0-20221221105603-fcedb00c5b30/go.mod h1:/Hzu8ych2oXCs1iNI+MeASyFzWTncQ6nlu/wgqbqC2A=
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
-go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
-go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
-go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
+go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
+go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
+go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
+go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
-go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
-go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
+go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
+go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/images/go-grpc-greeter-server/rootfs/go.mod b/images/go-grpc-greeter-server/rootfs/go.mod
index 1f4a1902d4..84b4baa309 100644
--- a/images/go-grpc-greeter-server/rootfs/go.mod
+++ b/images/go-grpc-greeter-server/rootfs/go.mod
@@ -4,7 +4,7 @@ go 1.24.4
require (
google.golang.org/grpc v1.73.0
- google.golang.org/grpc/examples v0.0.0-20250623054635-bdbe6a2b5d8d
+ google.golang.org/grpc/examples v0.0.0-20250625071442-a2d6045916b3
)
require (
diff --git a/images/go-grpc-greeter-server/rootfs/go.sum b/images/go-grpc-greeter-server/rootfs/go.sum
index dee4708091..8e7a73f948 100644
--- a/images/go-grpc-greeter-server/rootfs/go.sum
+++ b/images/go-grpc-greeter-server/rootfs/go.sum
@@ -30,7 +30,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
-google.golang.org/grpc/examples v0.0.0-20250623054635-bdbe6a2b5d8d h1:KTBpPCXkzYZY1oClOiUFFRChUbWribmDYjp7uBZZgv4=
-google.golang.org/grpc/examples v0.0.0-20250623054635-bdbe6a2b5d8d/go.mod h1:LEu4MhKupt/g4nRi+hCu5zfi4M84eGk0vBQLQKs9y9U=
+google.golang.org/grpc/examples v0.0.0-20250625071442-a2d6045916b3 h1:EvDp6R1QibPTxbpHOr9MVdt0fOsZ9P+ry5wkvd3ObME=
+google.golang.org/grpc/examples v0.0.0-20250625071442-a2d6045916b3/go.mod h1:LEu4MhKupt/g4nRi+hCu5zfi4M84eGk0vBQLQKs9y9U=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
From 1f3f2bcb62364211aa60a4ef9d35a79f8ccbc908 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Thu, 26 Jun 2025 07:02:55 +0200
Subject: [PATCH 025/361] Images: Trigger NGINX build. (#13554)
---
images/nginx/TAG | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/images/nginx/TAG b/images/nginx/TAG
index 826e142463..a4b6ac3ded 100644
--- a/images/nginx/TAG
+++ b/images/nginx/TAG
@@ -1 +1 @@
-v2.1.1
+v2.2.0
From 457e398de12ab0e8ce81ad54edbf0d7e778ae083 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Thu, 26 Jun 2025 21:58:29 +0200
Subject: [PATCH 026/361] Images: Bump NGINX to v2.2.0. (#13556)
---
NGINX_BASE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NGINX_BASE b/NGINX_BASE
index c87724e4ae..6801d9c647 100644
--- a/NGINX_BASE
+++ b/NGINX_BASE
@@ -1 +1 @@
-registry.k8s.io/ingress-nginx/nginx:v2.1.1@sha256:248a0d3e77c244b5a5478ecf3163b1d8d8baf7a517aef46006d5b09c6f0bcf76
+registry.k8s.io/ingress-nginx/nginx:v2.2.0@sha256:cf02a924bf423dcefc236f5da1a4e6d7a2638c8fc79df09fae4bbc87d859208d
From 60095a694885a0f5fc01d9f4bb7332e57e76e346 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Fri, 27 Jun 2025 16:38:23 +0200
Subject: [PATCH 027/361] Images: Trigger Test Runner build. (#13559)
---
images/test-runner/TAG | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/images/test-runner/TAG b/images/test-runner/TAG
index 826e142463..a4b6ac3ded 100644
--- a/images/test-runner/TAG
+++ b/images/test-runner/TAG
@@ -1 +1 @@
-v2.1.1
+v2.2.0
From 9e770b849abd2c7017d20092e8877150c632b942 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Fri, 27 Jun 2025 19:46:31 +0200
Subject: [PATCH 028/361] Tests: Bump Test Runner to v2.2.0. (#13564)
---
build/run-in-docker.sh | 2 +-
test/e2e-image/Makefile | 2 +-
test/e2e/run-chart-test.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index b55323ec01..e958d23dcd 100755
--- a/build/run-in-docker.sh
+++ b/build/run-in-docker.sh
@@ -41,7 +41,7 @@ function cleanup {
}
trap cleanup EXIT
-E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v2.1.1@sha256:01201e647bae6c805c00e1b532734c48798c4577bde12ccfb3eca3c0d00b10fd}
+E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v2.2.0@sha256:d0e1c47936200ea40294436dee573451aaae65bef5942cd3a4d56d43c92ad93d}
if [[ "$RUNTIME" == podman ]]; then
# Podman does not support both tag and digest
diff --git a/test/e2e-image/Makefile b/test/e2e-image/Makefile
index c53c6cd330..1e745f2484 100644
--- a/test/e2e-image/Makefile
+++ b/test/e2e-image/Makefile
@@ -1,6 +1,6 @@
DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-E2E_BASE_IMAGE ?= "registry.k8s.io/ingress-nginx/e2e-test-runner:v2.1.1@sha256:01201e647bae6c805c00e1b532734c48798c4577bde12ccfb3eca3c0d00b10fd"
+E2E_BASE_IMAGE ?= "registry.k8s.io/ingress-nginx/e2e-test-runner:v2.2.0@sha256:d0e1c47936200ea40294436dee573451aaae65bef5942cd3a4d56d43c92ad93d"
image:
echo "..entered Makefile in /test/e2e-image"
diff --git a/test/e2e/run-chart-test.sh b/test/e2e/run-chart-test.sh
index 29352e3702..08b9a5ece7 100755
--- a/test/e2e/run-chart-test.sh
+++ b/test/e2e/run-chart-test.sh
@@ -114,5 +114,5 @@ docker run \
--workdir /workdir \
--entrypoint ct \
--rm \
- registry.k8s.io/ingress-nginx/e2e-test-runner:v2.1.1@sha256:01201e647bae6c805c00e1b532734c48798c4577bde12ccfb3eca3c0d00b10fd \
+ registry.k8s.io/ingress-nginx/e2e-test-runner:v2.2.0@sha256:d0e1c47936200ea40294436dee573451aaae65bef5942cd3a4d56d43c92ad93d \
install --charts charts/ingress-nginx
From 1d64e7c43a5a129dd8dceae9617ab2fdc9ff0090 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Sun, 29 Jun 2025 09:40:29 +0200
Subject: [PATCH 029/361] Images: Trigger other builds (1/2). (#13567)
---
images/cfssl/TAG | 2 +-
images/custom-error-pages/TAG | 2 +-
images/e2e-test-echo/TAG | 2 +-
images/ext-auth-example-authsvc/TAG | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/images/cfssl/TAG b/images/cfssl/TAG
index c641220244..79127d85a4 100644
--- a/images/cfssl/TAG
+++ b/images/cfssl/TAG
@@ -1 +1 @@
-v1.1.4
+v1.2.0
diff --git a/images/custom-error-pages/TAG b/images/custom-error-pages/TAG
index c641220244..79127d85a4 100644
--- a/images/custom-error-pages/TAG
+++ b/images/custom-error-pages/TAG
@@ -1 +1 @@
-v1.1.4
+v1.2.0
diff --git a/images/e2e-test-echo/TAG b/images/e2e-test-echo/TAG
index c641220244..79127d85a4 100644
--- a/images/e2e-test-echo/TAG
+++ b/images/e2e-test-echo/TAG
@@ -1 +1 @@
-v1.1.4
+v1.2.0
diff --git a/images/ext-auth-example-authsvc/TAG b/images/ext-auth-example-authsvc/TAG
index c641220244..79127d85a4 100644
--- a/images/ext-auth-example-authsvc/TAG
+++ b/images/ext-auth-example-authsvc/TAG
@@ -1 +1 @@
-v1.1.4
+v1.2.0
From 5a4f379ee8e47b5a01e9dbd4c6bcb75a7f14a1bb Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Sun, 29 Jun 2025 10:14:29 +0200
Subject: [PATCH 030/361] Images: Trigger other builds (2/2). (#13570)
---
images/fastcgi-helloserver/TAG | 2 +-
images/go-grpc-greeter-server/TAG | 2 +-
images/httpbun/TAG | 2 +-
images/kube-webhook-certgen/TAG | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/images/fastcgi-helloserver/TAG b/images/fastcgi-helloserver/TAG
index c641220244..79127d85a4 100644
--- a/images/fastcgi-helloserver/TAG
+++ b/images/fastcgi-helloserver/TAG
@@ -1 +1 @@
-v1.1.4
+v1.2.0
diff --git a/images/go-grpc-greeter-server/TAG b/images/go-grpc-greeter-server/TAG
index c641220244..79127d85a4 100644
--- a/images/go-grpc-greeter-server/TAG
+++ b/images/go-grpc-greeter-server/TAG
@@ -1 +1 @@
-v1.1.4
+v1.2.0
diff --git a/images/httpbun/TAG b/images/httpbun/TAG
index c641220244..79127d85a4 100644
--- a/images/httpbun/TAG
+++ b/images/httpbun/TAG
@@ -1 +1 @@
-v1.1.4
+v1.2.0
diff --git a/images/kube-webhook-certgen/TAG b/images/kube-webhook-certgen/TAG
index f074f24d22..b7c0a9b1d9 100644
--- a/images/kube-webhook-certgen/TAG
+++ b/images/kube-webhook-certgen/TAG
@@ -1 +1 @@
-v1.5.4
+v1.6.0
From 147d650e0cebc75b8205d2cad75ae836292f2dbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 08:50:33 -0700
Subject: [PATCH 031/361] Bump github/codeql-action from 3.29.0 to 3.29.1 in
the actions group (#13576)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/scorecards.yml | 2 +-
.github/workflows/vulnerability-scans.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index eddf4b3a53..99c9fc029b 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -59,6 +59,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+ uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
with:
sarif_file: results.sarif
diff --git a/.github/workflows/vulnerability-scans.yaml b/.github/workflows/vulnerability-scans.yaml
index 4e8d83cb00..8172d5d96b 100644
--- a/.github/workflows/vulnerability-scans.yaml
+++ b/.github/workflows/vulnerability-scans.yaml
@@ -75,7 +75,7 @@ jobs:
# This step checks out a copy of your repository.
- name: Upload SARIF file
- uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+ uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
with:
token: ${{ github.token }}
# Path to SARIF file relative to the root of the repository
From d3654bd159de0450e3356ea472dda64165f6cb3b Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Mon, 30 Jun 2025 21:52:31 +0200
Subject: [PATCH 032/361] Tests & Docs: Bump images. (#13579)
---
docs/examples/canary/README.md | 4 ++--
.../custom-errors/custom-default-backend.helm.values.yaml | 2 +-
.../customization/custom-errors/custom-default-backend.yaml | 2 +-
.../customization/external-auth-headers/echo-service.yaml | 2 +-
test/e2e/HTTPBUN_IMAGE | 2 +-
test/e2e/framework/deployment.go | 2 +-
test/e2e/framework/fastcgi_helloserver.go | 2 +-
test/e2e/settings/ocsp/ocsp.go | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/examples/canary/README.md b/docs/examples/canary/README.md
index cf6b32ed4f..b202c6d42c 100644
--- a/docs/examples/canary/README.md
+++ b/docs/examples/canary/README.md
@@ -31,7 +31,7 @@ spec:
spec:
containers:
- name: production
- image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.4@sha256:0e7cf544a27bfdc9ed7f33cad2b6bc25cb6ae49f8bbdaa329dab3f31c65c44f6
+ image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.0@sha256:b2dd9bc9ab0e13795334b2921931ed3c77cc638ca45a95249f1291bf449a0d2a
ports:
- containerPort: 80
env:
@@ -97,7 +97,7 @@ spec:
spec:
containers:
- name: canary
- image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.4@sha256:0e7cf544a27bfdc9ed7f33cad2b6bc25cb6ae49f8bbdaa329dab3f31c65c44f6
+ image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.0@sha256:b2dd9bc9ab0e13795334b2921931ed3c77cc638ca45a95249f1291bf449a0d2a
ports:
- containerPort: 80
env:
diff --git a/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml b/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml
index 6debe45015..e0c841e54b 100644
--- a/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml
+++ b/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml
@@ -6,7 +6,7 @@ defaultBackend:
image:
registry: registry.k8s.io
image: ingress-nginx/custom-error-pages
- tag: v1.1.4@sha256:9151d8114e45a2d386c30e04cb17dd2c62c862f14d49b513ec083ec25cfced20
+ tag: v1.2.0@sha256:8e87a5e1f7e724bad689e0097b311f9ee23cbb2b28f8a41d4be75c0558819650
extraVolumes:
- name: custom-error-pages
configMap:
diff --git a/docs/examples/customization/custom-errors/custom-default-backend.yaml b/docs/examples/customization/custom-errors/custom-default-backend.yaml
index 91c14baf36..fb99d7c942 100644
--- a/docs/examples/customization/custom-errors/custom-default-backend.yaml
+++ b/docs/examples/customization/custom-errors/custom-default-backend.yaml
@@ -36,7 +36,7 @@ spec:
spec:
containers:
- name: nginx-error-server
- image: registry.k8s.io/ingress-nginx/custom-error-pages:v1.1.4@sha256:9151d8114e45a2d386c30e04cb17dd2c62c862f14d49b513ec083ec25cfced20
+ image: registry.k8s.io/ingress-nginx/custom-error-pages:v1.2.0@sha256:8e87a5e1f7e724bad689e0097b311f9ee23cbb2b28f8a41d4be75c0558819650
ports:
- containerPort: 8080
# Setting the environment variable DEBUG we can see the headers sent
diff --git a/docs/examples/customization/external-auth-headers/echo-service.yaml b/docs/examples/customization/external-auth-headers/echo-service.yaml
index 69d3f0b81a..aa8f907b53 100644
--- a/docs/examples/customization/external-auth-headers/echo-service.yaml
+++ b/docs/examples/customization/external-auth-headers/echo-service.yaml
@@ -18,7 +18,7 @@ spec:
terminationGracePeriodSeconds: 60
containers:
- name: echo-service
- image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.4@sha256:0e7cf544a27bfdc9ed7f33cad2b6bc25cb6ae49f8bbdaa329dab3f31c65c44f6
+ image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.0@sha256:b2dd9bc9ab0e13795334b2921931ed3c77cc638ca45a95249f1291bf449a0d2a
ports:
- containerPort: 8080
resources:
diff --git a/test/e2e/HTTPBUN_IMAGE b/test/e2e/HTTPBUN_IMAGE
index 24456c7951..b96db02bf5 100644
--- a/test/e2e/HTTPBUN_IMAGE
+++ b/test/e2e/HTTPBUN_IMAGE
@@ -1 +1 @@
-registry.k8s.io/ingress-nginx/httpbun:v1.1.4@sha256:6f6e3de1dd889dd7e72751e01437bbfefd1e90079f36101c42fbac8ef094e0ae
+registry.k8s.io/ingress-nginx/httpbun:v1.2.0@sha256:b41435f66a362dd325f1a4a856257e534d014354a6b935e12fe7f591b52ddcaf
diff --git a/test/e2e/framework/deployment.go b/test/e2e/framework/deployment.go
index 8ac1451b0b..b98b755d16 100644
--- a/test/e2e/framework/deployment.go
+++ b/test/e2e/framework/deployment.go
@@ -47,7 +47,7 @@ const NIPService = "external-nip"
var HTTPBunImage = os.Getenv("HTTPBUN_IMAGE")
// EchoImage is the default image to be used by the echo service
-const EchoImage = "registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.4@sha256:0e7cf544a27bfdc9ed7f33cad2b6bc25cb6ae49f8bbdaa329dab3f31c65c44f6" //#nosec G101
+const EchoImage = "registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.0@sha256:b2dd9bc9ab0e13795334b2921931ed3c77cc638ca45a95249f1291bf449a0d2a" //#nosec G101
// TODO: change all Deployment functions to use these options
// in order to reduce complexity and have a unified API across the
diff --git a/test/e2e/framework/fastcgi_helloserver.go b/test/e2e/framework/fastcgi_helloserver.go
index 9ba2f879a9..395067344e 100644
--- a/test/e2e/framework/fastcgi_helloserver.go
+++ b/test/e2e/framework/fastcgi_helloserver.go
@@ -59,7 +59,7 @@ func (f *Framework) NewNewFastCGIHelloServerDeploymentWithReplicas(replicas int3
Containers: []corev1.Container{
{
Name: "fastcgi-helloserver",
- Image: "registry.k8s.io/ingress-nginx/fastcgi-helloserver:v1.1.4@sha256:2547e6e6b1818e887fb2c9fdde8668aecfe720f39543435b5924bb823515b447",
+ Image: "registry.k8s.io/ingress-nginx/fastcgi-helloserver:v1.2.0@sha256:237c3f816ed38fd6b51303e7118cac759b8f8fbd97e477ebedf966c1c6100b6a",
Env: []corev1.EnvVar{},
Ports: []corev1.ContainerPort{
{
diff --git a/test/e2e/settings/ocsp/ocsp.go b/test/e2e/settings/ocsp/ocsp.go
index 099342c60b..52917087fc 100644
--- a/test/e2e/settings/ocsp/ocsp.go
+++ b/test/e2e/settings/ocsp/ocsp.go
@@ -297,7 +297,7 @@ func ocspserveDeployment(namespace string) (*appsv1.Deployment, *corev1.Service)
Containers: []corev1.Container{
{
Name: name,
- Image: "registry.k8s.io/ingress-nginx/cfssl:v1.1.4@sha256:56ae16e665fd8e24d3d23773f13d3724583a566e833713959cfe51d9323576e9",
+ Image: "registry.k8s.io/ingress-nginx/cfssl:v1.2.0@sha256:cd3715cf6f32817b5beff83e45814586f6046aca751139bc0b1e4addde849bbb",
Command: []string{
"/bin/bash",
"-c",
From 2a467c5419e6094abf34bdb94b821877787897bf Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Tue, 1 Jul 2025 08:06:34 +0200
Subject: [PATCH 033/361] Chart: Bump Kube Webhook CertGen. (#13580)
---
charts/ingress-nginx/README.md | 4 ++--
charts/ingress-nginx/values.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md
index 654517f6d2..5851a05190 100644
--- a/charts/ingress-nginx/README.md
+++ b/charts/ingress-nginx/README.md
@@ -273,10 +273,10 @@ metadata:
| controller.admissionWebhooks.namespaceSelector | object | `{}` | |
| controller.admissionWebhooks.objectSelector | object | `{}` | |
| controller.admissionWebhooks.patch.enabled | bool | `true` | |
-| controller.admissionWebhooks.patch.image.digest | string | `"sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e"` | |
+| controller.admissionWebhooks.patch.image.digest | string | `"sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb"` | |
| controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` | |
| controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` | |
-| controller.admissionWebhooks.patch.image.tag | string | `"v1.5.4"` | |
+| controller.admissionWebhooks.patch.image.tag | string | `"v1.6.0"` | |
| controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
| controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
| controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index a2ca4ec2ee..75ae80244d 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -822,8 +822,8 @@ controller:
## for backwards compatibility consider setting the full image url via the repository value below
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
## repository:
- tag: v1.5.4
- digest: sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ tag: v1.6.0
+ digest: sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
pullPolicy: IfNotPresent
# -- Provide a priority class name to the webhook patching job
##
From 4cbb78a9dc4f1888af802b70ddf980272e01268b Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Tue, 1 Jul 2025 08:10:32 +0200
Subject: [PATCH 034/361] Images: Trigger controller build. (#13585)
---
TAG | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/TAG b/TAG
index ba2906d066..b281204620 100644
--- a/TAG
+++ b/TAG
@@ -1 +1 @@
-main
+v1.13.0
From 9dc73d17c76e2289408ebff2f3446b8b13c3e72e Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Mon, 7 Jul 2025 23:19:45 +0200
Subject: [PATCH 035/361] Release controller v1.13.0/v1.12.4/v1.11.8 & chart
v4.13.0/v4.12.4/v4.11.8. (#13592)
---
README.md | 3 +
changelog/controller-1.11.8.md | 43 ++++
changelog/controller-1.12.4.md | 43 ++++
changelog/controller-1.13.0.md | 239 ++++++++++++++++++
charts/ingress-nginx/Chart.yaml | 6 +-
charts/ingress-nginx/README.md | 8 +-
.../changelog/helm-chart-4.11.8.md | 9 +
.../changelog/helm-chart-4.12.4.md | 9 +
.../changelog/helm-chart-4.13.0.md | 9 +
charts/ingress-nginx/values.yaml | 9 +-
deploy/static/provider/aws/deploy.yaml | 51 ++--
.../aws/nlb-with-tls-termination/deploy.yaml | 51 ++--
deploy/static/provider/baremetal/deploy.yaml | 51 ++--
deploy/static/provider/cloud/deploy.yaml | 51 ++--
deploy/static/provider/do/deploy.yaml | 51 ++--
deploy/static/provider/exoscale/deploy.yaml | 51 ++--
deploy/static/provider/kind/deploy.yaml | 54 ++--
deploy/static/provider/oracle/deploy.yaml | 51 ++--
deploy/static/provider/scw/deploy.yaml | 51 ++--
docs/deploy/index.md | 20 +-
docs/e2e-tests.md | 14 +-
21 files changed, 627 insertions(+), 247 deletions(-)
create mode 100644 changelog/controller-1.11.8.md
create mode 100644 changelog/controller-1.12.4.md
create mode 100644 changelog/controller-1.13.0.md
create mode 100644 charts/ingress-nginx/changelog/helm-chart-4.11.8.md
create mode 100644 charts/ingress-nginx/changelog/helm-chart-4.12.4.md
create mode 100644 charts/ingress-nginx/changelog/helm-chart-4.13.0.md
diff --git a/README.md b/README.md
index b7c8b9e7c1..4f3ad7f00a 100644
--- a/README.md
+++ b/README.md
@@ -39,11 +39,14 @@ the versions listed. Ingress-Nginx versions **may** work on older versions, but
| Supported | Ingress-NGINX version | k8s supported version | Alpine Version | Nginx Version | Helm Chart Version |
| :-------: | --------------------- | ----------------------------- | -------------- | ------------- | ------------------ |
+| 🔄 | **v1.13.0** | 1.33, 1.32, 1.31, 1.30, 1.29 | 3.22.0 | 1.27.1 | 4.13.0 |
+| 🔄 | **v1.12.4** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.22.0 | 1.25.5 | 4.12.4 |
| 🔄 | **v1.12.3** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.3 | 1.25.5 | 4.12.3 |
| 🔄 | **v1.12.2** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.3 | 1.25.5 | 4.12.2 |
| 🔄 | **v1.12.1** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.3 | 1.25.5 | 4.12.1 |
| 🔄 | **v1.12.0** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.0 | 1.25.5 | 4.12.0 |
| 🔄 | **v1.12.0-beta.0** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.20.3 | 1.25.5 | 4.12.0-beta.0 |
+| 🔄 | **v1.11.8** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.22.0 | 1.25.5 | 4.11.8 |
| 🔄 | **v1.11.7** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.7 |
| 🔄 | **v1.11.6** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.6 |
| 🔄 | **v1.11.5** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.5 |
diff --git a/changelog/controller-1.11.8.md b/changelog/controller-1.11.8.md
new file mode 100644
index 0000000000..db76e5d075
--- /dev/null
+++ b/changelog/controller-1.11.8.md
@@ -0,0 +1,43 @@
+# Changelog
+
+### controller-v1.11.8
+
+Images:
+
+* registry.k8s.io/ingress-nginx/controller:v1.11.8@sha256:695d79381ee6af00c7f5c9fd434f50851d7d32838ad5b2c507e416cf2084fc79
+* registry.k8s.io/ingress-nginx/controller-chroot:v1.11.8@sha256:aa8719c133a0b491586341aa19d3ec9afe61bb6210cb295e752df1daa31f2df1
+
+### All changes:
+
+* Images: Trigger controller build. (#13587)
+* Chart: Bump Kube Webhook CertGen. (#13584)
+* Tests & Docs: Bump images. (#13583)
+* Images: Trigger other builds (2/2). (#13572)
+* Images: Trigger other builds (1/2). (#13569)
+* Tests: Bump Test Runner to v1.4.0. (#13563)
+* Images: Trigger Test Runner build. (#13561)
+* Images: Bump NGINX to v0.4.0. (#13558)
+* Images: Trigger NGINX build. (#13553)
+* Go: Update dependencies. (#13550)
+* Go: Update dependencies. (#13544)
+* CI: Update Kubernetes to v1.33.2. (#13541)
+* NGINX: Bump to OpenResty v1.25.3.2. (#13531)
+* Go: Update dependencies. (#13522)
+* Docs: Fix function names in comments. (#13519)
+* Go: Update dependencies. (#13512)
+* Go: Bump to v1.24.4. (#13495)
+* Images: Bump Alpine to v3.22. (#13492)
+* Images: Update LuaRocks to v3.12.0. (#13489)
+* Images: Fix LuaRocks. (#13478)
+
+### Dependency updates:
+
+* Bump github/codeql-action from 3.29.0 to 3.29.1 in the actions group (#13578)
+* Bump docker/setup-buildx-action from 3.10.0 to 3.11.1 in the actions group (#13547)
+* Bump github/codeql-action from 3.28.19 to 3.29.0 in the actions group (#13527)
+* Bump google.golang.org/grpc from 1.72.2 to 1.73.0 (#13509)
+* Bump google.golang.org/grpc from 1.72.2 to 1.73.0 in /images/go-grpc-greeter-server/rootfs (#13507)
+* Bump golang.org/x/crypto from 0.38.0 to 0.39.0 (#13505)
+* Bump the actions group with 2 updates (#13503)
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.11.7...controller-v1.11.8
diff --git a/changelog/controller-1.12.4.md b/changelog/controller-1.12.4.md
new file mode 100644
index 0000000000..cb4e9160f6
--- /dev/null
+++ b/changelog/controller-1.12.4.md
@@ -0,0 +1,43 @@
+# Changelog
+
+### controller-v1.12.4
+
+Images:
+
+* registry.k8s.io/ingress-nginx/controller:v1.12.4@sha256:05890cb25d37aa5cfe086614104f798f55e1eeec8dda26d9fd6f6acf0e1554a0
+* registry.k8s.io/ingress-nginx/controller-chroot:v1.12.4@sha256:0873534e85a765ef4958ba4fbc5c970a3644dca0f5eee7caff93d830b9a8bb8b
+
+### All changes:
+
+* Images: Trigger controller build. (#13586)
+* Chart: Bump Kube Webhook CertGen. (#13582)
+* Tests & Docs: Bump images. (#13581)
+* Images: Trigger other builds (2/2). (#13571)
+* Images: Trigger other builds (1/2). (#13574)
+* Tests: Bump Test Runner to v1.4.0. (#13562)
+* Images: Trigger Test Runner build. (#13560)
+* Images: Bump NGINX to v1.3.0. (#13557)
+* Images: Trigger NGINX build. (#13552)
+* Go: Update dependencies. (#13549)
+* Go: Update dependencies. (#13543)
+* CI: Update Kubernetes to v1.33.2. (#13540)
+* NGINX: Bump to OpenResty v1.25.3.2. (#13530)
+* Go: Update dependencies. (#13521)
+* Docs: Fix function names in comments. (#13518)
+* Go: Update dependencies. (#13511)
+* Go: Bump to v1.24.4. (#13494)
+* Images: Bump Alpine to v3.22. (#13491)
+* Images: Update LuaRocks to v3.12.0. (#13487)
+* Images: Fix LuaRocks. (#13477)
+
+### Dependency updates:
+
+* Bump github/codeql-action from 3.29.0 to 3.29.1 in the actions group (#13577)
+* Bump docker/setup-buildx-action from 3.10.0 to 3.11.1 in the actions group (#13546)
+* Bump github/codeql-action from 3.28.19 to 3.29.0 in the actions group (#13526)
+* Bump google.golang.org/grpc from 1.72.2 to 1.73.0 (#13508)
+* Bump google.golang.org/grpc from 1.72.2 to 1.73.0 in /images/go-grpc-greeter-server/rootfs (#13506)
+* Bump golang.org/x/crypto from 0.38.0 to 0.39.0 (#13504)
+* Bump the actions group with 2 updates (#13502)
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.12.3...controller-v1.12.4
diff --git a/changelog/controller-1.13.0.md b/changelog/controller-1.13.0.md
new file mode 100644
index 0000000000..0d9c192d75
--- /dev/null
+++ b/changelog/controller-1.13.0.md
@@ -0,0 +1,239 @@
+# Changelog
+
+### controller-v1.13.0
+
+Images:
+
+* registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
+* registry.k8s.io/ingress-nginx/controller-chroot:v1.13.0@sha256:af6264394cfa61d21f644d87372823064804e64de737b0747e86c86348b29c9f
+
+### All changes:
+
+* Images: Trigger controller build. (#13585)
+* Chart: Bump Kube Webhook CertGen. (#13580)
+* Tests & Docs: Bump images. (#13579)
+* Images: Trigger other builds (2/2). (#13570)
+* Images: Trigger other builds (1/2). (#13567)
+* Tests: Bump Test Runner to v2.2.0. (#13564)
+* Images: Trigger Test Runner build. (#13559)
+* Images: Bump NGINX to v2.2.0. (#13556)
+* Images: Trigger NGINX build. (#13554)
+* Go: Update dependencies. (#13548)
+* Go: Update dependencies. (#13542)
+* CI: Update Kubernetes to v1.33.2. (#13539)
+* NGINX: Bump to OpenResty v1.27.1.2. (#13524)
+* Go: Update dependencies. (#13520)
+* Docs: Fix function names in comments. (#13517)
+* Chart: Add `activeDeadlineSeconds`. (#13497)
+* Go: Update dependencies. (#13510)
+* Go: Bump to v1.24.4. (#13493)
+* Images: Bump Alpine to v3.22. (#13490)
+* Images: Update LuaRocks to v3.12.0. (#13486)
+* Images: Fix LuaRocks. (#13476)
+* Release controller v1.12.3/v1.11.7 & chart v4.12.3/v4.11.7. (#13470)
+* Images: Trigger controller build. (#13463)
+* Chart: Bump Kube Webhook CertGen. (#13458)
+* Tests & Docs: Bump images. (#13457)
+* Docs: Add OpenTelemetry defaults. (#13454)
+* Images: Trigger other builds (2/2). (#13441)
+* Images: Trigger other builds (1/2). (#13438)
+* Tests: Bump Test Runner to v2.1.1. (#13435)
+* Images: Trigger Test Runner build. (#13431)
+* NGINX: Correctly determine client IP. (#12768)
+* Lua: Fix `ExternalName` services without endpoints. (#13154)
+* Images: Bump NGINX to v2.1.1. (#13426)
+* Controller: Add traffic distribution support. (#12974)
+* NGINX: Add X-Original-Forwarded-Host header. (#12999)
+* Images: Trigger NGINX build. (#13423)
+* Go: Update dependencies. (#13419)
+* Images: Build Go gRPC Greeter Server from scratch. (#13405)
+* Chart: Remove validation for removed API. (#13406)
+* Go: Update dependencies. (#13398)
+* Images: Bump GCB Docker GCloud to v20250513-9264efb079. (#13393)
+* CI: Update Kubernetes. (#13392)
+* Fix 🐛: Markdown requires nested content inside a list item to be indented (#13388)
+* Chart: Implement `runtimeClassName`. (#13381)
+* Tests: Bump Test Runner to v2.1.0. (#13354)
+* Images: Trigger Test Runner build. (#13348)
+* Go: Bump to v1.24.3. (#13341)
+* Images: Bump NGINX to v2.1.0. (#13345)
+* Images: Trigger NGINX build. (#13337)
+* NGINX: Add NJS. (#13324)
+* Go: Update dependencies. (#13326)
+* Go: Update dependencies. (#13321)
+* Release controller v1.12.2/v1.11.6 & chart v4.12.2/v4.11.6. (#13318)
+* Chart: Bump Kube Webhook CertGen. (#13310)
+* Tests & Docs: Bump images. (#13307)
+* Images: Trigger other builds (2/2). (#13292)
+* Images: Trigger other builds (1/2). (#13289)
+* Tests: Bump Test Runner to v2.0.3. (#13286)
+* Go: Update dependencies. (#13282)
+* Images: Trigger Test Runner build. (#13268)
+* Images: Bump NGINX to v2.0.3. (#13265)
+* Images: Trigger NGINX build. (#13261)
+* Go: Update dependencies. (#13257)
+* CI: Update Kubernetes to v1.32.4. (#13254)
+* Docs: How to modify NLB TCP timeout. (#13242)
+* Go: Update dependencies. (#13245)
+* Docs: Improve formatting in `monitoring.md`. (#13239)
+* Docs: Enable metrics in manifest-based deployments. (#13171)
+* Tests: Bump Test Runner to v2.0.2. (#13232)
+* Images: Trigger Test Runner build. (#13224)
+* Images: Bump `NGINX_BASE` to v2.0.2. (#13221)
+* Images: Trigger NGINX build. (#13218)
+* Go: Update dependencies. (#13209)
+* Docs: Fix link in installation instructions. (#13190)
+* Go: Update dependencies. (#13147)
+* Go: Bump to v1.24.2. (#13146)
+* Annotations: Allow ciphers with underscores. (#13110)
+* CI: Do not fail fast. (#13120)
+* Images: Fix FromAsCasing. (#13117)
+* Images: Extract modules. (#13114)
+* Plugin: Improve error handling. (#13102)
+* Docs: Fix OpenTelemetry listing. (#13106)
+* Tests: Fallback to `yq`. (#13079)
+* Go: Fix Mage. (#13077)
+* Release controller v1.12.1/v1.11.5 & chart v4.12.1/v4.11.5. (#13075)
+* Controller: Several security fixes. (#13068)
+* Chart: Bump Kube Webhook CertGen. (#13063)
+* Tests & Docs: Bump images. (#13062)
+* Images: Trigger other builds (2/2). (#13057)
+* Images: Trigger other builds (1/2). (#13056)
+* Tests: Bump Test Runner to v2.0.1. (#13047)
+* Images: Trigger Test Runner build. (#13043)
+* Images: Bump `NGINX_BASE` to v2.0.1. (#13042)
+* Images: Trigger NGINX build. (#13038)
+* Go: Update dependencies. (#13035)
+* CI: Update KIND to v1.32.3. (#13022)
+* CI: Update Kubernetes to v1.32.3. (#13021)
+* Images: Rework. (3/3) (#13010)
+* Images: Rework. (2/3) (#13013)
+* Images: Rework. (1/3) (#13008)
+* Custom Error Pages: Accept first of many MIME types. (#13005)
+* Docs: Use `enable-global-auth` annotation instead of non-existing ConfigMap option. (#12976)
+* Go: Update dependencies. (#12962)
+* Docs: Update link to `values.yaml`. (#12947)
+* fix DNS issues with unresolvable backends with ExternalName (#10989)
+* Go: Bump to v1.24.1. (#12935)
+* CI: Update KIND images. (#12907)
+* Test: Remove gRPC Fortune Teller. (#12928)
+* Chart: Add `controller.admissionWebhooks.certManager.*.revisionHistoryLimit`. (#12906)
+* NGINX: Update ModSecurity. (#12914)
+* Development: Update KIND images. (#12908)
+* Network: Rework IPv6 check. (#12905)
+* Config: Remove notes about future defaults. (#12896)
+* Images: Update `kubectl` to v1.32.2. (#12845)
+* Development: Update Kubernetes to v1.32.0. (#12848)
+* CI: Update `kubectl` to v1.32.2. (#12844)
+* Images: Migrate to AR. (2/2) (#12840)
+* Images: Migrate to AR. (1/2) (#12839)
+* Docs: Migrate to AR. (#12807)
+* Docs: Enable code copy button. (#12804)
+* Go: Bump to v1.23.6. (#12799)
+* CI: Update Artifact Hub to v1.20.0. (#12785)
+* Images: Update `kubectl` to v1.31.5. (#12788)
+* CI: Update `kubectl` to v1.31.5. (#12786)
+* Development: Bump Kubernetes to v1.31.4. (#12782)
+* Go: Replace `golang.org/x/exp/slices` with `slices`. (#12779)
+* Docs: Fix character format. (#12770)
+* Docs: Improve bare-metal setup. (#12743)
+* Chart: Add `controller.service.external.labels` & `controller.service.internal.labels`. (#12704)
+* Build: Always use local `tmp` dir on macOS. (#12734)
+* Development: Bump Kubernetes to v1.31.4. (#12733)
+* Images: Bump `gcb-docker-gcloud` to v20250116-2a05ea7e3d. (#12718)
+* Go: Bump to v1.23.5. (#12717)
+* Docs: Clarify rate limits are per ingress controller replica. (#12714)
+* Go: Stop using workspace. (#12703)
+* Chart: Bump Kube Webhook CertGen. (#12693)
+* Tests & Docs: Bump images. (#12692)
+* Images: Trigger other builds (2/2). (#12689)
+* Images: Trigger other builds (1/2). (#12686)
+* Tests: Bump Test Runner to v20250112-a188f4eb. (#12683)
+* Images: Trigger Test Runner build. (#12680)
+* Images: Bump `NGINX_BASE` to v2.0.0. (#12676)
+* Images: Trigger NGINX build. (#12672)
+* NGINX: Align quotes. (#12669)
+* Annotations: Deny newlines. (#12640)
+* Chart: Add `controller.service.trafficDistribution`. (#12571)
+* NGINX: Bump to OpenResty v1.27.1.1. (#12229)
+* Annotations: Reload on custom header changes. (#11709)
+* NGINX: Bump ModSecurity. (#12641)
+* NGINX: Bump OpenTelemetry. (#12371)
+* NGINX: Remove unused substitutions module. (#12449)
+
+### Dependency updates:
+
+* Bump github/codeql-action from 3.29.0 to 3.29.1 in the actions group (#13576)
+* Bump docker/setup-buildx-action from 3.10.0 to 3.11.1 in the actions group (#13545)
+* Bump github/codeql-action from 3.28.19 to 3.29.0 in the actions group (#13525)
+* Bump google.golang.org/grpc from 1.72.2 to 1.73.0 (#13499)
+* Bump google.golang.org/grpc from 1.72.2 to 1.73.0 in /images/go-grpc-greeter-server/rootfs (#13501)
+* Bump golang.org/x/crypto from 0.38.0 to 0.39.0 (#13500)
+* Bump the actions group with 2 updates (#13498)
+* Bump ossf/scorecard-action from 2.4.1 to 2.4.2 in the actions group (#13449)
+* Bump the go group across 2 directories with 1 update (#13413)
+* Bump sigs.k8s.io/controller-runtime from 0.20.4 to 0.21.0 (#13412)
+* Bump the actions group with 3 updates (#13379)
+* Bump github.com/prometheus/common from 0.63.0 to 0.64.0 (#13378)
+* Bump the go group across 4 directories with 10 updates (#13377)
+* Bump golang.org/x/crypto from 0.37.0 to 0.38.0 (#13361)
+* Bump the actions group with 2 updates (#13362)
+* Bump golang.org/x/oauth2 from 0.29.0 to 0.30.0 (#13360)
+* Bump dario.cat/mergo from 1.0.1 to 1.0.2 in the go group across 1 directory (#13359)
+* Bump github/codeql-action from 3.28.16 to 3.28.17 in the actions group (#13331)
+* Bump golangci/golangci-lint-action from 7.0.0 to 8.0.0 (#13330)
+* Bump actions/download-artifact from 4.2.1 to 4.3.0 in the actions group (#13303)
+* Bump the actions group with 2 updates (#13279)
+* Bump github.com/onsi/ginkgo/v2 from 2.23.3 to 2.23.4 (#13212)
+* Bump the go group across 2 directories with 1 update (#13196)
+* Bump github.com/prometheus/client_golang from 1.21.1 to 1.22.0 (#13199)
+* Bump github/codeql-action from 3.28.14 to 3.28.15 in the actions group (#13198)
+* Bump github.com/prometheus/client_golang from 1.21.1 to 1.22.0 in /images/custom-error-pages/rootfs (#13197)
+* Bump golang.org/x/oauth2 from 0.28.0 to 0.29.0 (#13168)
+* Bump the go group across 2 directories with 1 update (#13169)
+* Bump github.com/fsnotify/fsnotify from 1.8.0 to 1.9.0 (#13170)
+* Bump golang.org/x/crypto from 0.36.0 to 0.37.0 (#13167)
+* Bump the actions group with 2 updates (#13166)
+* Bump goreleaser/goreleaser-action from 6.2.1 to 6.3.0 in the actions group (#13132)
+* Bump golangci/golangci-lint-action from 6.5.2 to 7.0.0 (#13116)
+* Bump the actions group with 2 updates (#13115)
+* Bump github.com/opencontainers/runc from 1.2.5 to 1.2.6 in the go group across 1 directory (#13032)
+* Bump github.com/onsi/ginkgo/v2 from 2.23.0 to 2.23.3 (#13020)
+* Bump the actions group with 5 updates (#13019)
+* Bump dorny/test-reporter from 1.9.1 to 2.0.0 (#12982)
+* Bump github.com/prometheus/common from 0.62.0 to 0.63.0 (#12980)
+* Bump the go group across 3 directories with 9 updates (#12979)
+* Bump the actions group with 3 updates (#12981)
+* Bump github/codeql-action from 3.28.10 to 3.28.11 in the actions group (#12965)
+* Bump github.com/onsi/ginkgo/v2 from 2.22.2 to 2.23.0 (#12953)
+* Bump golang.org/x/crypto from 0.35.0 to 0.36.0 (#12954)
+* Bump the go group across 2 directories with 1 update (#12933)
+* Bump google.golang.org/grpc from 1.70.0 to 1.71.0 (#12934)
+* Bump golang.org/x/crypto from 0.34.0 to 0.35.0 (#12920)
+* Bump the actions group with 3 updates (#12919)
+* Bump github.com/prometheus/client_golang from 1.20.5 to 1.21.0 (#12887)
+* Bump golang.org/x/crypto from 0.33.0 to 0.34.0 (#12888)
+* Bump github.com/prometheus/client_golang from 1.20.5 to 1.21.0 in /images/custom-error-pages/rootfs (#12886)
+* Bump the actions group with 4 updates (#12885)
+* Bump github.com/spf13/cobra from 1.8.1 to 1.9.1 (#12859)
+* Bump the go group across 3 directories with 11 updates (#12857)
+* Bump the actions group with 2 updates (#12860)
+* Bump github.com/spf13/cobra from 1.8.1 to 1.9.1 in /images/kube-webhook-certgen/rootfs (#12858)
+* Bump the actions group with 4 updates (#12811)
+* Bump golang.org/x/crypto from 0.32.0 to 0.33.0 (#12810)
+* Bump the actions group with 2 updates (#12772)
+* Bump the go group across 2 directories with 1 update (#12771)
+* Bump google.golang.org/grpc from 1.69.4 to 1.70.0 (#12755)
+* Bump sigs.k8s.io/controller-runtime from 0.20.0 to 0.20.1 in the go group across 1 directory (#12754)
+* Bump the actions group with 5 updates (#12753)
+* Bump sigs.k8s.io/controller-runtime from 0.19.4 to 0.20.0 (#12723)
+* Bump github.com/prometheus/common from 0.61.0 to 0.62.0 (#12722)
+* Bump the go group across 3 directories with 9 updates (#12721)
+* Bump golangci/golangci-lint-action from 6.1.1 to 6.2.0 in the actions group (#12720)
+* Bump google.golang.org/grpc from 1.69.2 to 1.69.4 in the go group across 1 directory (#12698)
+* Bump the actions group with 3 updates (#12659)
+* Bump the go group across 1 directory with 3 updates (#12657)
+* Bump golang.org/x/crypto from 0.31.0 to 0.32.0 (#12658)
+* Bump github.com/onsi/ginkgo/v2 from 2.22.1 to 2.22.2 (#12627)
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.12.0...controller-v1.13.0
diff --git a/charts/ingress-nginx/Chart.yaml b/charts/ingress-nginx/Chart.yaml
index 2c6d9aa6b2..a462deb3cc 100644
--- a/charts/ingress-nginx/Chart.yaml
+++ b/charts/ingress-nginx/Chart.yaml
@@ -1,9 +1,9 @@
annotations:
artifacthub.io/changes: |
- - Update Ingress-Nginx version controller-v1.12.3
+ - Update Ingress-Nginx version controller-v1.13.0
artifacthub.io/prerelease: "false"
apiVersion: v2
-appVersion: 1.12.3
+appVersion: 1.13.0
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
load balancer
home: https://github.com/kubernetes/ingress-nginx
@@ -20,4 +20,4 @@ maintainers:
name: ingress-nginx
sources:
- https://github.com/kubernetes/ingress-nginx
-version: 4.12.3
+version: 4.13.0
diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md
index 5851a05190..0b1fcdcef1 100644
--- a/charts/ingress-nginx/README.md
+++ b/charts/ingress-nginx/README.md
@@ -2,7 +2,7 @@
[ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
- 
+ 
To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
@@ -345,8 +345,8 @@ metadata:
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
| controller.image.allowPrivilegeEscalation | bool | `false` | |
| controller.image.chroot | bool | `false` | |
-| controller.image.digest | string | `"sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee"` | |
-| controller.image.digestChroot | string | `"sha256:d830fba93e9e0f5ef1462f5fe8a7cd7b167178b79e6c10c041c7da19f1ac66ab"` | |
+| controller.image.digest | string | `"sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2"` | |
+| controller.image.digestChroot | string | `"sha256:af6264394cfa61d21f644d87372823064804e64de737b0747e86c86348b29c9f"` | |
| controller.image.image | string | `"ingress-nginx/controller"` | |
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
| controller.image.readOnlyRootFilesystem | bool | `false` | |
@@ -354,7 +354,7 @@ metadata:
| controller.image.runAsNonRoot | bool | `true` | |
| controller.image.runAsUser | int | `101` | This value must not be changed using the official image. uid=101(www-data) gid=82(www-data) groups=82(www-data) |
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
-| controller.image.tag | string | `"v1.12.3"` | |
+| controller.image.tag | string | `"v1.13.0"` | |
| controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
| controller.ingressClassResource | object | `{"aliases":[],"annotations":{},"controllerValue":"k8s.io/ingress-nginx","default":false,"enabled":true,"name":"nginx","parameters":{}}` | This section refers to the creation of the IngressClass resource. IngressClasses are immutable and cannot be changed after creation. We do not support namespaced IngressClasses, yet, so a ClusterRole and a ClusterRoleBinding is required. |
diff --git a/charts/ingress-nginx/changelog/helm-chart-4.11.8.md b/charts/ingress-nginx/changelog/helm-chart-4.11.8.md
new file mode 100644
index 0000000000..902b49e36b
--- /dev/null
+++ b/charts/ingress-nginx/changelog/helm-chart-4.11.8.md
@@ -0,0 +1,9 @@
+# Changelog
+
+This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
+
+### 4.11.8
+
+* Update Ingress-Nginx version controller-v1.11.8
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.7...helm-chart-4.11.8
diff --git a/charts/ingress-nginx/changelog/helm-chart-4.12.4.md b/charts/ingress-nginx/changelog/helm-chart-4.12.4.md
new file mode 100644
index 0000000000..43472aef72
--- /dev/null
+++ b/charts/ingress-nginx/changelog/helm-chart-4.12.4.md
@@ -0,0 +1,9 @@
+# Changelog
+
+This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
+
+### 4.12.4
+
+* Update Ingress-Nginx version controller-v1.12.4
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.12.3...helm-chart-4.12.4
diff --git a/charts/ingress-nginx/changelog/helm-chart-4.13.0.md b/charts/ingress-nginx/changelog/helm-chart-4.13.0.md
new file mode 100644
index 0000000000..41fc9b5d50
--- /dev/null
+++ b/charts/ingress-nginx/changelog/helm-chart-4.13.0.md
@@ -0,0 +1,9 @@
+# Changelog
+
+This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
+
+### 4.13.0
+
+* Update Ingress-Nginx version controller-v1.13.0
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.12.0...helm-chart-4.13.0
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 75ae80244d..d747d30d92 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -30,9 +30,9 @@ controller:
## for backwards compatibility consider setting the full image url via the repository value below
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
## repository:
- tag: "v1.12.3"
- digest: sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
- digestChroot: sha256:d830fba93e9e0f5ef1462f5fe8a7cd7b167178b79e6c10c041c7da19f1ac66ab
+ tag: "v1.13.0"
+ digest: sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
+ digestChroot: sha256:af6264394cfa61d21f644d87372823064804e64de737b0747e86c86348b29c9f
pullPolicy: IfNotPresent
runAsNonRoot: true
# -- This value must not be changed using the official image.
@@ -534,7 +534,6 @@ controller:
# -- Traffic distribution policy of the external controller service. Set to "PreferClose" to route traffic to endpoints that are topologically closer to the client.
# Ref: https://kubernetes.io/docs/concepts/services-networking/service/#traffic-distribution
trafficDistribution: ""
-
# -- Represents the dual-stack capabilities of the external controller service. Possible values are SingleStack, PreferDualStack or RequireDualStack.
# Fields `ipFamilies` and `clusterIP` depend on the value of this field.
# Ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
@@ -624,7 +623,6 @@ controller:
# -- Traffic distribution policy of the internal controller service. Set to "PreferClose" to route traffic to endpoints that are topologically closer to the client.
# Ref: https://kubernetes.io/docs/concepts/services-networking/service/#traffic-distribution
trafficDistribution: ""
-
# -- Represents the dual-stack capabilities of the internal controller service. Possible values are SingleStack, PreferDualStack or RequireDualStack.
# Fields `ipFamilies` and `clusterIP` depend on the value of this field.
# Ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
@@ -1193,7 +1191,6 @@ defaultBackend:
# This value is immutable. Set once, it can not be changed without deleting and re-creating the service.
# Ref: https://kubernetes.io/docs/concepts/services-networking/service/#choosing-your-own-ip-address
clusterIPs: []
-
# -- List of IP addresses at which the default backend service is available
## Ref: https://kubernetes.io/docs/concepts/services-networking/service/#external-ips
##
diff --git a/deploy/static/provider/aws/deploy.yaml b/deploy/static/provider/aws/deploy.yaml
index e34243fd40..924c5c3526 100644
--- a/deploy/static/provider/aws/deploy.yaml
+++ b/deploy/static/provider/aws/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -344,7 +344,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -377,7 +377,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -400,7 +400,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -422,8 +422,9 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
spec:
+ automountServiceAccountToken: true
containers:
- args:
- /nginx-ingress-controller
@@ -446,7 +447,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -523,7 +524,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -534,9 +535,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
spec:
+ automountServiceAccountToken: true
containers:
- args:
- create
@@ -548,7 +550,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -576,7 +578,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -587,9 +589,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
spec:
+ automountServiceAccountToken: true
containers:
- args:
- patch
@@ -603,7 +606,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -631,7 +634,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -644,7 +647,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
index a044aca4ee..27968b657c 100644
--- a/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
+++ b/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -335,7 +335,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -353,7 +353,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -386,7 +386,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -409,7 +409,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -431,8 +431,9 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
spec:
+ automountServiceAccountToken: true
containers:
- args:
- /nginx-ingress-controller
@@ -455,7 +456,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -535,7 +536,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -546,9 +547,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
spec:
+ automountServiceAccountToken: true
containers:
- args:
- create
@@ -560,7 +562,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -588,7 +590,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -599,9 +601,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
spec:
+ automountServiceAccountToken: true
containers:
- args:
- patch
@@ -615,7 +618,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -643,7 +646,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -656,7 +659,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/baremetal/deploy.yaml b/deploy/static/provider/baremetal/deploy.yaml
index 9ba97f72b3..2acc428e90 100644
--- a/deploy/static/provider/baremetal/deploy.yaml
+++ b/deploy/static/provider/baremetal/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -340,7 +340,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -372,7 +372,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -395,7 +395,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -417,8 +417,9 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
spec:
+ automountServiceAccountToken: true
containers:
- args:
- /nginx-ingress-controller
@@ -440,7 +441,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -517,7 +518,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -528,9 +529,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
spec:
+ automountServiceAccountToken: true
containers:
- args:
- create
@@ -542,7 +544,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -570,7 +572,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -581,9 +583,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
spec:
+ automountServiceAccountToken: true
containers:
- args:
- patch
@@ -597,7 +600,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -625,7 +628,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -638,7 +641,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/cloud/deploy.yaml b/deploy/static/provider/cloud/deploy.yaml
index 7d23319aa7..f4637ef36f 100644
--- a/deploy/static/provider/cloud/deploy.yaml
+++ b/deploy/static/provider/cloud/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -340,7 +340,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -373,7 +373,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -396,7 +396,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -418,8 +418,9 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
spec:
+ automountServiceAccountToken: true
containers:
- args:
- /nginx-ingress-controller
@@ -442,7 +443,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -519,7 +520,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -530,9 +531,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
spec:
+ automountServiceAccountToken: true
containers:
- args:
- create
@@ -544,7 +546,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -572,7 +574,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -583,9 +585,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
spec:
+ automountServiceAccountToken: true
containers:
- args:
- patch
@@ -599,7 +602,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -627,7 +630,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -640,7 +643,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/do/deploy.yaml b/deploy/static/provider/do/deploy.yaml
index b4c5fc370d..4957959e3e 100644
--- a/deploy/static/provider/do/deploy.yaml
+++ b/deploy/static/provider/do/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -329,7 +329,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -343,7 +343,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -376,7 +376,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -399,7 +399,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -421,8 +421,9 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
spec:
+ automountServiceAccountToken: true
containers:
- args:
- /nginx-ingress-controller
@@ -445,7 +446,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -522,7 +523,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -533,9 +534,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
spec:
+ automountServiceAccountToken: true
containers:
- args:
- create
@@ -547,7 +549,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -575,7 +577,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -586,9 +588,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
spec:
+ automountServiceAccountToken: true
containers:
- args:
- patch
@@ -602,7 +605,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -630,7 +633,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -643,7 +646,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/exoscale/deploy.yaml b/deploy/static/provider/exoscale/deploy.yaml
index 2005fb0785..0567c4bc40 100644
--- a/deploy/static/provider/exoscale/deploy.yaml
+++ b/deploy/static/provider/exoscale/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -349,7 +349,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -382,7 +382,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -405,7 +405,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -423,8 +423,9 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
spec:
+ automountServiceAccountToken: true
containers:
- args:
- /nginx-ingress-controller
@@ -447,7 +448,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -528,7 +529,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -539,9 +540,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
spec:
+ automountServiceAccountToken: true
containers:
- args:
- create
@@ -553,7 +555,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -581,7 +583,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -592,9 +594,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
spec:
+ automountServiceAccountToken: true
containers:
- args:
- patch
@@ -608,7 +611,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -636,7 +639,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -649,7 +652,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/kind/deploy.yaml b/deploy/static/provider/kind/deploy.yaml
index 0723a24a62..4bcf13cfc2 100644
--- a/deploy/static/provider/kind/deploy.yaml
+++ b/deploy/static/provider/kind/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -340,7 +340,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -362,7 +362,7 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
- type: NodePort
+ type: LoadBalancer
---
apiVersion: v1
kind: Service
@@ -372,7 +372,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -395,7 +395,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -417,8 +417,9 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
spec:
+ automountServiceAccountToken: true
containers:
- args:
- /nginx-ingress-controller
@@ -442,7 +443,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -505,7 +506,6 @@ spec:
readOnly: true
dnsPolicy: ClusterFirst
nodeSelector:
- ingress-ready: "true"
kubernetes.io/os: linux
serviceAccountName: ingress-nginx
terminationGracePeriodSeconds: 0
@@ -529,7 +529,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -540,9 +540,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
spec:
+ automountServiceAccountToken: true
containers:
- args:
- create
@@ -554,7 +555,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -582,7 +583,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -593,9 +594,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
spec:
+ automountServiceAccountToken: true
containers:
- args:
- patch
@@ -609,7 +611,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -637,7 +639,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -650,7 +652,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/oracle/deploy.yaml b/deploy/static/provider/oracle/deploy.yaml
index 8157176fa7..16095e0136 100644
--- a/deploy/static/provider/oracle/deploy.yaml
+++ b/deploy/static/provider/oracle/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -344,7 +344,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -377,7 +377,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -400,7 +400,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -422,8 +422,9 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
spec:
+ automountServiceAccountToken: true
containers:
- args:
- /nginx-ingress-controller
@@ -446,7 +447,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -523,7 +524,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -534,9 +535,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
spec:
+ automountServiceAccountToken: true
containers:
- args:
- create
@@ -548,7 +550,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -576,7 +578,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -587,9 +589,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
spec:
+ automountServiceAccountToken: true
containers:
- args:
- patch
@@ -603,7 +606,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -631,7 +634,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -644,7 +647,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/deploy/static/provider/scw/deploy.yaml b/deploy/static/provider/scw/deploy.yaml
index eee6adeaa5..b79264a3a4 100644
--- a/deploy/static/provider/scw/deploy.yaml
+++ b/deploy/static/provider/scw/deploy.yaml
@@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
---
@@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
---
@@ -40,7 +40,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
rules:
@@ -130,7 +130,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
rules:
@@ -149,7 +149,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
rules:
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
rules:
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
namespace: ingress-nginx
roleRef:
@@ -270,7 +270,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
namespace: ingress-nginx
roleRef:
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -329,7 +329,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
---
@@ -343,7 +343,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -376,7 +376,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller-admission
namespace: ingress-nginx
spec:
@@ -399,7 +399,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-controller
namespace: ingress-nginx
spec:
@@ -421,8 +421,9 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
spec:
+ automountServiceAccountToken: true
containers:
- args:
- /nginx-ingress-controller
@@ -445,7 +446,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- image: registry.k8s.io/ingress-nginx/controller:v1.12.3@sha256:ac444cd9515af325ba577b596fe4f27a34be1aa330538e8b317ad9d6c8fb94ee
+ image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -522,7 +523,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
namespace: ingress-nginx
spec:
@@ -533,9 +534,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-create
spec:
+ automountServiceAccountToken: true
containers:
- args:
- create
@@ -547,7 +549,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: create
securityContext:
@@ -575,7 +577,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
namespace: ingress-nginx
spec:
@@ -586,9 +588,10 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission-patch
spec:
+ automountServiceAccountToken: true
containers:
- args:
- patch
@@ -602,7 +605,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.4@sha256:7a38cf0f8480775baaee71ab519c7465fd1dfeac66c421f28f087786e631456e
+ image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
imagePullPolicy: IfNotPresent
name: patch
securityContext:
@@ -630,7 +633,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: nginx
spec:
controller: k8s.io/ingress-nginx
@@ -643,7 +646,7 @@ metadata:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
- app.kubernetes.io/version: 1.12.3
+ app.kubernetes.io/version: 1.13.0
name: ingress-nginx-admission
webhooks:
- admissionReviewVersions:
diff --git a/docs/deploy/index.md b/docs/deploy/index.md
index 498aaaa31b..19fdfe8063 100644
--- a/docs/deploy/index.md
+++ b/docs/deploy/index.md
@@ -92,7 +92,7 @@ helm show values ingress-nginx --repo https://kubernetes.github.io/ingress-nginx
**If you don't have Helm** or if you prefer to use a YAML manifest, you can run the following command instead:
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/cloud/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/cloud/deploy.yaml
```
!!! info
@@ -274,7 +274,7 @@ In AWS, we use a Network load balancer (NLB) to expose the Ingress-Nginx Control
##### Network Load Balancer (NLB)
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/aws/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/aws/deploy.yaml
```
##### TLS termination in AWS Load Balancer (NLB)
@@ -282,10 +282,10 @@ kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/cont
By default, TLS is terminated in the ingress controller. But it is also possible to terminate TLS in the Load Balancer.
This section explains how to do that on AWS using an NLB.
-1. Download the [deploy.yaml](https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml) template
+1. Download the [deploy.yaml](https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml) template
```console
- wget https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
+ wget https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml
```
2. Edit the file and change the VPC CIDR in use for the Kubernetes cluster:
@@ -334,7 +334,7 @@ kubectl create clusterrolebinding cluster-admin-binding \
Then, the ingress controller can be installed like this:
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/cloud/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/cloud/deploy.yaml
```
!!! warning
@@ -351,7 +351,7 @@ Proxy-protocol is supported in GCE check the [Official Documentations on how to
#### Azure
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/cloud/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/cloud/deploy.yaml
```
More information with regard to Azure annotations for ingress controller can be found in the [official AKS documentation](https://docs.microsoft.com/en-us/azure/aks/ingress-internal-ip#create-an-ingress-controller).
@@ -359,7 +359,7 @@ More information with regard to Azure annotations for ingress controller can be
#### Digital Ocean
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/do/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/do/deploy.yaml
```
- By default the service object of the ingress-nginx-controller for Digital-Ocean, only configures one annotation. Its this one `service.beta.kubernetes.io/do-loadbalancer-enable-proxy-protocol: "true"`. While this makes the service functional, it was reported that the Digital-Ocean LoadBalancer graphs shows `no data`, unless a few other annotations are also configured. Some of these other annotations require values that can not be generic and hence not forced in a out-of-the-box installation. These annotations and a discussion on them is well documented in [this issue](https://github.com/kubernetes/ingress-nginx/issues/8965). Please refer to the issue to add annotations, with values specific to user, to get graphs of the DO-LB populated with data.
@@ -367,7 +367,7 @@ kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/cont
#### Scaleway
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/scw/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/scw/deploy.yaml
```
Refer to the [dedicated tutorial](https://www.scaleway.com/en/docs/tutorials/proxy-protocol-v2-load-balancer/#configuring-proxy-protocol-for-ingress-nginx) in the Scaleway documentation for configuring the proxy protocol for ingress-nginx with the Scaleway load balancer.
@@ -384,7 +384,7 @@ The full list of annotations supported by Exoscale is available in the Exoscale
#### Oracle Cloud Infrastructure
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/cloud/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/cloud/deploy.yaml
```
A
@@ -411,7 +411,7 @@ For quick testing, you can use a
This should work on almost every cluster, but it will typically use a port in the range 30000-32767.
```console
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.3/deploy/static/provider/baremetal/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/baremetal/deploy.yaml
```
For more information about bare metal deployments (and how to use port 80 instead of a random port in the 30000-32767 range),
diff --git a/docs/e2e-tests.md b/docs/e2e-tests.md
index 56b94e03d2..84d733aee8 100644
--- a/docs/e2e-tests.md
+++ b/docs/e2e-tests.md
@@ -400,10 +400,10 @@ Do not try to edit it manually.
- [should not create sync events](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/disable_sync_events.go#L83)
### [enable-real-ip](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/enable_real_ip.go#L30)
- [trusts X-Forwarded-For header only when setting is true](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/enable_real_ip.go#L40)
-- [should not trust X-Forwarded-For header when setting is false](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/enable_real_ip.go#L79)
+- [should not trust X-Forwarded-For header when setting is false](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/enable_real_ip.go#L80)
### [use-forwarded-headers](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/forwarded_headers.go#L31)
- [should trust X-Forwarded headers when setting is true](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/forwarded_headers.go#L41)
-- [should not trust X-Forwarded headers when setting is false](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/forwarded_headers.go#L93)
+- [should not trust X-Forwarded headers when setting is false](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/forwarded_headers.go#L95)
### [Geoip2](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L36)
- [should include geoip2 line in config when enabled and db file exists](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L45)
- [should only allow requests from specific countries](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L69)
@@ -510,10 +510,12 @@ Do not try to edit it manually.
### [proxy-next-upstream](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_next_upstream.go#L28)
- [should build proxy next upstream using configmap values](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_next_upstream.go#L36)
### [use-proxy-protocol](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L38)
-- [should respect port passed by the PROXY Protocol](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L48)
-- [should respect proto passed by the PROXY Protocol server port](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L85)
-- [should enable PROXY Protocol for HTTPS](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L121)
-- [should enable PROXY Protocol for TCP](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L164)
+- [should respect port passed by the PROXY Protocol](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L49)
+- [should respect proto passed by the PROXY Protocol server port](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L86)
+- [should enable PROXY Protocol for HTTPS](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L122)
+- [should enable PROXY Protocol for TCP](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L165)
+- [should not trust X-Forwarded headers when the client IP address is not trusted](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L238)
+- [should trust X-Forwarded headers when the client IP address is trusted](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_protocol.go#L274)
### [proxy-read-timeout](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_read_timeout.go#L29)
- [should set valid proxy read timeouts using configmap values](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_read_timeout.go#L37)
- [should not set invalid proxy read timeouts using configmap values](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/proxy_read_timeout.go#L53)
From af725173706a40f21e74c2c8718684e2fd40ce48 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Wed, 16 Jul 2025 16:12:37 +0200
Subject: [PATCH 036/361] Bye bye, v1.11. (#13614)
---
README.md | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index 4f3ad7f00a..2568c6f2e6 100644
--- a/README.md
+++ b/README.md
@@ -46,22 +46,22 @@ the versions listed. Ingress-Nginx versions **may** work on older versions, but
| 🔄 | **v1.12.1** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.3 | 1.25.5 | 4.12.1 |
| 🔄 | **v1.12.0** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.21.0 | 1.25.5 | 4.12.0 |
| 🔄 | **v1.12.0-beta.0** | 1.32, 1.31, 1.30, 1.29, 1.28 | 3.20.3 | 1.25.5 | 4.12.0-beta.0 |
-| 🔄 | **v1.11.8** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.22.0 | 1.25.5 | 4.11.8 |
-| 🔄 | **v1.11.7** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.7 |
-| 🔄 | **v1.11.6** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.6 |
-| 🔄 | **v1.11.5** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.5 |
-| 🔄 | **v1.11.4** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.0 | 1.25.5 | 4.11.4 |
-| 🔄 | **v1.11.3** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.3 | 1.25.5 | 4.11.3 |
-| 🔄 | **v1.11.2** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.11.2 |
-| 🔄 | **v1.11.1** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.11.1 |
-| 🔄 | **v1.11.0** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.11.0 |
-| | **v1.10.6** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.0 | 1.25.5 | 4.10.6 |
-| | **v1.10.5** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.3 | 1.25.5 | 4.10.5 |
-| | **v1.10.4** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.10.4 |
-| | **v1.10.3** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.10.3 |
-| | **v1.10.2** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.10.2 |
-| | **v1.10.1** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.1 |
-| | **v1.10.0** | 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.0 |
+| | v1.11.8 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.22.0 | 1.25.5 | 4.11.8 |
+| | v1.11.7 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.7 |
+| | v1.11.6 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.6 |
+| | v1.11.5 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.3 | 1.25.5 | 4.11.5 |
+| | v1.11.4 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.0 | 1.25.5 | 4.11.4 |
+| | v1.11.3 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.3 | 1.25.5 | 4.11.3 |
+| | v1.11.2 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.11.2 |
+| | v1.11.1 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.11.1 |
+| | v1.11.0 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.11.0 |
+| | v1.10.6 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.21.0 | 1.25.5 | 4.10.6 |
+| | v1.10.5 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.3 | 1.25.5 | 4.10.5 |
+| | v1.10.4 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.10.4 |
+| | v1.10.3 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.10.3 |
+| | v1.10.2 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.10.2 |
+| | v1.10.1 | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.1 |
+| | v1.10.0 | 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.0 |
| | v1.9.6 | 1.29, 1.28, 1.27, 1.26, 1.25 | 3.19.0 | 1.21.6 | 4.9.1 |
| | v1.9.5 | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.9.0 |
| | v1.9.4 | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.3 |
From 266905dcc53a9d05264c85c44f9259ee8676e745 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Thu, 17 Jul 2025 08:01:16 +0200
Subject: [PATCH 037/361] Go: Bump to v1.24.5. (#13627)
---
GOLANG_VERSION | 2 +-
go.mod | 2 +-
images/custom-error-pages/rootfs/go.mod | 2 +-
images/ext-auth-example-authsvc/rootfs/go.mod | 2 +-
images/fastcgi-helloserver/rootfs/go.mod | 2 +-
images/go-grpc-greeter-server/rootfs/go.mod | 2 +-
images/kube-webhook-certgen/rootfs/go.mod | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/GOLANG_VERSION b/GOLANG_VERSION
index 2f4320f67f..6521720b41 100644
--- a/GOLANG_VERSION
+++ b/GOLANG_VERSION
@@ -1 +1 @@
-1.24.4
+1.24.5
diff --git a/go.mod b/go.mod
index db26976730..bbe4d8d7ff 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module k8s.io/ingress-nginx
-go 1.24.4
+go 1.24.5
require (
dario.cat/mergo v1.0.2
diff --git a/images/custom-error-pages/rootfs/go.mod b/images/custom-error-pages/rootfs/go.mod
index 1c8aa41af5..549ac4f031 100644
--- a/images/custom-error-pages/rootfs/go.mod
+++ b/images/custom-error-pages/rootfs/go.mod
@@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/custom-error-pages
-go 1.24.4
+go 1.24.5
require github.com/prometheus/client_golang v1.22.0
diff --git a/images/ext-auth-example-authsvc/rootfs/go.mod b/images/ext-auth-example-authsvc/rootfs/go.mod
index 346ef33968..2dc0e6b9a4 100644
--- a/images/ext-auth-example-authsvc/rootfs/go.mod
+++ b/images/ext-auth-example-authsvc/rootfs/go.mod
@@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/ext-auth-example-authsvc
-go 1.24.4
+go 1.24.5
require k8s.io/apimachinery v0.33.2
diff --git a/images/fastcgi-helloserver/rootfs/go.mod b/images/fastcgi-helloserver/rootfs/go.mod
index 70a7550639..1eb2ac1215 100644
--- a/images/fastcgi-helloserver/rootfs/go.mod
+++ b/images/fastcgi-helloserver/rootfs/go.mod
@@ -1,3 +1,3 @@
module k8s.io/ingress-nginx/fastcgi-helloserver
-go 1.24.4
+go 1.24.5
diff --git a/images/go-grpc-greeter-server/rootfs/go.mod b/images/go-grpc-greeter-server/rootfs/go.mod
index 84b4baa309..c45f37876f 100644
--- a/images/go-grpc-greeter-server/rootfs/go.mod
+++ b/images/go-grpc-greeter-server/rootfs/go.mod
@@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/go-grpc-greeter-server
-go 1.24.4
+go 1.24.5
require (
google.golang.org/grpc v1.73.0
diff --git a/images/kube-webhook-certgen/rootfs/go.mod b/images/kube-webhook-certgen/rootfs/go.mod
index 749c198b1e..3b65ee3ab8 100644
--- a/images/kube-webhook-certgen/rootfs/go.mod
+++ b/images/kube-webhook-certgen/rootfs/go.mod
@@ -1,6 +1,6 @@
module github.com/jet/kube-webhook-certgen
-go 1.24.4
+go 1.24.5
require (
github.com/onrik/logrus v0.11.0
From abd6138f96f7ab327d918525e8708f0018d44336 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Thu, 17 Jul 2025 08:12:56 +0200
Subject: [PATCH 038/361] CI: Update Kubernetes to v1.33.3. (#13628)
---
.github/workflows/ci.yaml | 2 +-
images/test-runner/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2238963c33..f7820e6636 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -172,7 +172,7 @@ jobs:
- name: Prepare Host
run: |
- curl -LO https://dl.k8s.io/release/v1.33.2/bin/linux/amd64/kubectl
+ curl -LO https://dl.k8s.io/release/v1.33.3/bin/linux/amd64/kubectl
chmod +x ./kubectl
sudo mv ./kubectl /usr/local/bin/kubectl
diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile
index d861cd7cd5..cccc42dda7 100644
--- a/images/test-runner/Makefile
+++ b/images/test-runner/Makefile
@@ -35,7 +35,7 @@ build: builder
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
--build-arg GOLANG_VERSION=$(GOLANG_VERSION) \
--build-arg ETCD_VERSION=3.5.13-0 \
- --build-arg K8S_RELEASE=v1.33.2 \
+ --build-arg K8S_RELEASE=v1.33.3 \
--build-arg RESTY_CLI_VERSION=0.27 \
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
--build-arg LUAROCKS_VERSION=v3.12.0 \
From 2b54cbf01c61a8b5274c18680956196b4248d4be Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Thu, 17 Jul 2025 10:58:24 +0200
Subject: [PATCH 039/361] Go: Update dependencies. (#13624)
---
go.mod | 59 ++++----
go.sum | 126 ++++++++++--------
images/custom-error-pages/rootfs/go.mod | 4 +-
images/custom-error-pages/rootfs/go.sum | 8 +-
images/ext-auth-example-authsvc/rootfs/go.mod | 2 +-
images/ext-auth-example-authsvc/rootfs/go.sum | 4 +-
images/go-grpc-greeter-server/rootfs/go.mod | 12 +-
images/go-grpc-greeter-server/rootfs/go.sum | 44 +++---
images/kube-webhook-certgen/rootfs/go.mod | 23 ++--
images/kube-webhook-certgen/rootfs/go.sum | 50 ++++---
10 files changed, 176 insertions(+), 156 deletions(-)
diff --git a/go.mod b/go.mod
index bbe4d8d7ff..4ad0461a07 100644
--- a/go.mod
+++ b/go.mod
@@ -18,29 +18,29 @@ require (
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
github.com/ncabatoff/process-exporter v0.8.7
github.com/onsi/ginkgo/v2 v2.23.4
- github.com/opencontainers/cgroups v0.0.3
+ github.com/opencontainers/cgroups v0.0.4
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
github.com/prometheus/client_golang v1.22.0
github.com/prometheus/client_model v0.6.2
github.com/prometheus/common v0.65.0
github.com/spf13/cobra v1.9.1
- github.com/spf13/pflag v1.0.6
+ github.com/spf13/pflag v1.0.7
github.com/stretchr/testify v1.10.0
github.com/vmware-labs/yaml-jsonpath v0.3.2
github.com/yudai/gojsondiff v1.0.0
github.com/zakjan/cert-chain-resolver v0.0.0-20221221105603-fcedb00c5b30
- golang.org/x/crypto v0.39.0
- google.golang.org/grpc v1.73.0
+ golang.org/x/crypto v0.40.0
+ google.golang.org/grpc v1.74.0
gopkg.in/go-playground/pool.v3 v3.1.1
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
- k8s.io/api v0.33.2
- k8s.io/apiextensions-apiserver v0.33.2
- k8s.io/apimachinery v0.33.2
- k8s.io/apiserver v0.33.2
- k8s.io/cli-runtime v0.33.2
- k8s.io/client-go v0.33.2
- k8s.io/code-generator v0.33.2
- k8s.io/component-base v0.33.2
+ k8s.io/api v0.33.3
+ k8s.io/apiextensions-apiserver v0.33.3
+ k8s.io/apimachinery v0.33.3
+ k8s.io/apiserver v0.33.3
+ k8s.io/cli-runtime v0.33.3
+ k8s.io/client-go v0.33.3
+ k8s.io/code-generator v0.33.3
+ k8s.io/component-base v0.33.3
k8s.io/klog/v2 v2.130.1
pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732
sigs.k8s.io/controller-runtime v0.21.0
@@ -49,9 +49,10 @@ require (
require (
github.com/Masterminds/semver v1.5.0 // indirect
+ github.com/carapace-sh/carapace-shlex v1.0.1 // indirect
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
github.com/dprotaso/go-yit v0.0.0-20250513224043-18a80f8f6df4 // indirect
- github.com/fxamacker/cbor/v2 v2.8.0 // indirect
+ github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/google/go-querystring v1.1.0 // indirect
@@ -60,6 +61,9 @@ require (
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
+ go.yaml.in/yaml/v2 v2.4.2 // indirect
+ go.yaml.in/yaml/v3 v3.0.4 // indirect
+ golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/helm v2.17.0+incompatible // indirect
@@ -94,8 +98,7 @@ require (
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.7.0 // indirect
- github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
- github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+ github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -114,32 +117,32 @@ require (
github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
- github.com/prometheus/procfs v0.16.1 // indirect
+ github.com/prometheus/procfs v0.17.0 // indirect
github.com/sergi/go-diff v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
github.com/yudai/pp v2.0.1+incompatible // indirect
- golang.org/x/mod v0.25.0 // indirect
- golang.org/x/net v0.41.0 // indirect
+ golang.org/x/mod v0.26.0 // indirect
+ golang.org/x/net v0.42.0 // indirect
golang.org/x/oauth2 v0.30.0
- golang.org/x/sync v0.15.0 // indirect
- golang.org/x/sys v0.33.0 // indirect
- golang.org/x/term v0.32.0 // indirect
- golang.org/x/text v0.26.0 // indirect
+ golang.org/x/sync v0.16.0 // indirect
+ golang.org/x/sys v0.34.0 // indirect
+ golang.org/x/term v0.33.0 // indirect
+ golang.org/x/text v0.27.0 // indirect
golang.org/x/time v0.12.0 // indirect
- golang.org/x/tools v0.34.0 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
+ golang.org/x/tools v0.35.0 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1
- k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
+ k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
- sigs.k8s.io/kustomize/api v0.19.0 // indirect
- sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
+ sigs.k8s.io/kustomize/api v0.20.0 // indirect
+ sigs.k8s.io/kustomize/kyaml v0.20.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
- sigs.k8s.io/yaml v1.4.0 // indirect
+ sigs.k8s.io/yaml v1.5.0 // indirect
)
diff --git a/go.sum b/go.sum
index 83c7063cc9..28b829a8df 100644
--- a/go.sum
+++ b/go.sum
@@ -14,6 +14,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
+github.com/carapace-sh/carapace-shlex v1.0.1 h1:ww0JCgWpOVuqWG7k3724pJ18Lq8gh5pHQs9j3ojUs1c=
+github.com/carapace-sh/carapace-shlex v1.0.1/go.mod h1:lJ4ZsdxytE0wHJ8Ta9S7Qq0XpjgjU0mdfCqiI2FHx7M=
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ=
@@ -46,8 +48,8 @@ github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8
github.com/fullsailor/pkcs7 v0.0.0-20160414161337-2585af45975b/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa h1:RDBNVkRviHZtvDvId8XSGPu3rmpmSe+wKRcEWNgsfWU=
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
-github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
-github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
+github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
@@ -91,10 +93,8 @@ github.com/google/go-github/v48 v48.2.0/go.mod h1:dDlehKBDo850ZPvCTK0sEqTCVWcrGl
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a h1://KbezygeMJZCSHH+HgUZiTeSoiuFspbMg1ge+eFj18=
-github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
+github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 h1:xhMrHhTJ6zxu3gA4enFM9MLn9AY7613teCdFnlUVbSQ=
+github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
@@ -172,8 +172,8 @@ github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOT
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
-github.com/opencontainers/cgroups v0.0.3 h1:Jc9dWh/0YLGjdy6J/9Ln8NM5BfTA4W2BY0GMozy3aDU=
-github.com/opencontainers/cgroups v0.0.3/go.mod h1:s8lktyhlGUqM7OSRL5P7eAW6Wb+kWPNvt4qvVfzA5vs=
+github.com/opencontainers/cgroups v0.0.4 h1:XVj8P/IHVms/j+7eh8ggdkTLAxjz84ZzuFyGoE28DR4=
+github.com/opencontainers/cgroups v0.0.4/go.mod h1:s8lktyhlGUqM7OSRL5P7eAW6Wb+kWPNvt4qvVfzA5vs=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -189,8 +189,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
-github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
-github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
+github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
+github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -201,8 +201,9 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
+github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
@@ -236,10 +237,10 @@ go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
-go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
-go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
-go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
-go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
+go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
+go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
+go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
+go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
@@ -250,30 +251,34 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
+go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
+golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
-golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
+golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
-golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -282,32 +287,36 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
+golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
-golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
+golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
+golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
+golang.org/x/tools/go/expect v0.1.0-deprecated h1:jY2C5HGYR5lqex3gEniOQL0r7Dq5+VGVgY1nudX5lXY=
+golang.org/x/tools/go/expect v0.1.0-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
+golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
+golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
-google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
-google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 h1:1ZwqphdOdWYXsUHgMpU/101nCtf/kSp9hOrcvFsnl10=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.74.0 h1:sxRSkyLxlceWQiqDofxDot3d4u7DyoHPc7SBXMj8gGY=
+google.golang.org/grpc v1.74.0/go.mod h1:NZUaK8dAMUfzhK6uxZ+9511LtOrk73UGWOFoNvz7z+s=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -336,24 +345,24 @@ gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
-k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
-k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8=
-k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8=
-k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
-k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/apiserver v0.33.2 h1:KGTRbxn2wJagJowo29kKBp4TchpO1DRO3g+dB/KOJN4=
-k8s.io/apiserver v0.33.2/go.mod h1:9qday04wEAMLPWWo9AwqCZSiIn3OYSZacDyu/AcoM/M=
-k8s.io/cli-runtime v0.33.2 h1:koNYQKSDdq5AExa/RDudXMhhtFasEg48KLS2KSAU74Y=
-k8s.io/cli-runtime v0.33.2/go.mod h1:gnhsAWpovqf1Zj5YRRBBU7PFsRc6NkEkwYNQE+mXL88=
-k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
-k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
-k8s.io/code-generator v0.33.2 h1:PCJ0Y6viTCxxJHMOyGqYwWEteM4q6y1Hqo2rNpl6jF4=
-k8s.io/code-generator v0.33.2/go.mod h1:hBjCA9kPMpjLWwxcr75ReaQfFXY8u+9bEJJ7kRw3J8c=
-k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0=
-k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k=
-k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 h1:2OX19X59HxDprNCVrWi6jb7LW1PoqTlYqEq5H2oetog=
-k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
+k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
+k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
+k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
+k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
+k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
+k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
+k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
+k8s.io/cli-runtime v0.33.3 h1:Dgy4vPjNIu8LMJBSvs8W0LcdV0PX/8aGG1DA1W8lklA=
+k8s.io/cli-runtime v0.33.3/go.mod h1:yklhLklD4vLS8HNGgC9wGiuHWze4g7x6XQZ+8edsKEo=
+k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
+k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
+k8s.io/code-generator v0.33.3 h1:6+34LhYkIuQ/yn/E3qlpVqjQaP8smzCu4NE1A8b0LWs=
+k8s.io/code-generator v0.33.3/go.mod h1:6Y02+HQJYgNphv9z3wJB5w+sjYDIEBQW7sh62PkufvA=
+k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=
+k8s.io/component-base v0.33.3/go.mod h1:ktBVsBzkI3imDuxYXmVxZ2zxJnYTZ4HAsVj9iF09qp4=
+k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f h1:SLb+kxmzfA87x4E4brQzB33VBbT2+x7Zq9ROIHmGn9Q=
+k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
k8s.io/helm v2.17.0+incompatible h1:Bpn6o1wKLYqKM3+Osh8e+1/K2g/GsQJ4F4yNF2+deao=
k8s.io/helm v2.17.0+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
@@ -368,10 +377,10 @@ sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytI
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
-sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
-sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=
-sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
-sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
+sigs.k8s.io/kustomize/api v0.20.0 h1:xPLqcobHI0bThyRUteO+nCV8G4d1Rlo5HafO57VRcas=
+sigs.k8s.io/kustomize/api v0.20.0/go.mod h1:F6CfaV27oevRCMJgehLqyX81dlUnRX/Fc13Uo7+OSo4=
+sigs.k8s.io/kustomize/kyaml v0.20.0 h1:tT8KMKi4R3hCJ1+9HDdek2VoXpkerP92ZfF6fDgGw14=
+sigs.k8s.io/kustomize/kyaml v0.20.0/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
sigs.k8s.io/mdtoc v1.4.0 h1:2pDEwJSjoVrGr5BPkG+LoLkYLKvgtGYurrBY8ul3SxQ=
sigs.k8s.io/mdtoc v1.4.0/go.mod h1:KVnRRtK1rX9aQ95qF0rt3x2ytTxf3r7W7N41H+0KF0k=
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
@@ -381,5 +390,6 @@ sigs.k8s.io/release-utils v0.8.3 h1:KtOtA4qDmzJyeQ2zkDsFVI25+NViwms/o5eL2NftFdA=
sigs.k8s.io/release-utils v0.8.3/go.mod h1:fp82Fma06OXBhEJ+GUJKqvcplDBomruK1R/1fWJnsrQ=
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
-sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
+sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
+sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
diff --git a/images/custom-error-pages/rootfs/go.mod b/images/custom-error-pages/rootfs/go.mod
index 549ac4f031..bffe0b4b89 100644
--- a/images/custom-error-pages/rootfs/go.mod
+++ b/images/custom-error-pages/rootfs/go.mod
@@ -10,7 +10,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.65.0 // indirect
- github.com/prometheus/procfs v0.16.1 // indirect
- golang.org/x/sys v0.33.0 // indirect
+ github.com/prometheus/procfs v0.17.0 // indirect
+ golang.org/x/sys v0.34.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
)
diff --git a/images/custom-error-pages/rootfs/go.sum b/images/custom-error-pages/rootfs/go.sum
index 884c28cd3b..82a5ff0253 100644
--- a/images/custom-error-pages/rootfs/go.sum
+++ b/images/custom-error-pages/rootfs/go.sum
@@ -20,12 +20,12 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
-github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
-github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
+github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
+github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/images/ext-auth-example-authsvc/rootfs/go.mod b/images/ext-auth-example-authsvc/rootfs/go.mod
index 2dc0e6b9a4..eaec632a50 100644
--- a/images/ext-auth-example-authsvc/rootfs/go.mod
+++ b/images/ext-auth-example-authsvc/rootfs/go.mod
@@ -2,6 +2,6 @@ module k8s.io/ingress-nginx/ext-auth-example-authsvc
go 1.24.5
-require k8s.io/apimachinery v0.33.2
+require k8s.io/apimachinery v0.33.3
require github.com/google/uuid v1.6.0 // indirect
diff --git a/images/ext-auth-example-authsvc/rootfs/go.sum b/images/ext-auth-example-authsvc/rootfs/go.sum
index 2dfc291dca..fdcc2cbff3 100644
--- a/images/ext-auth-example-authsvc/rootfs/go.sum
+++ b/images/ext-auth-example-authsvc/rootfs/go.sum
@@ -1,4 +1,4 @@
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
-k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
+k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
diff --git a/images/go-grpc-greeter-server/rootfs/go.mod b/images/go-grpc-greeter-server/rootfs/go.mod
index c45f37876f..8add5ef3b0 100644
--- a/images/go-grpc-greeter-server/rootfs/go.mod
+++ b/images/go-grpc-greeter-server/rootfs/go.mod
@@ -3,14 +3,14 @@ module k8s.io/ingress-nginx/go-grpc-greeter-server
go 1.24.5
require (
- google.golang.org/grpc v1.73.0
- google.golang.org/grpc/examples v0.0.0-20250625071442-a2d6045916b3
+ google.golang.org/grpc v1.74.0
+ google.golang.org/grpc/examples v0.0.0-20250716094922-0a12fb0d8439
)
require (
- golang.org/x/net v0.41.0 // indirect
- golang.org/x/sys v0.33.0 // indirect
- golang.org/x/text v0.26.0 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
+ golang.org/x/net v0.42.0 // indirect
+ golang.org/x/sys v0.34.0 // indirect
+ golang.org/x/text v0.27.0 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect
google.golang.org/protobuf v1.36.6 // indirect
)
diff --git a/images/go-grpc-greeter-server/rootfs/go.sum b/images/go-grpc-greeter-server/rootfs/go.sum
index 8e7a73f948..36c5380f37 100644
--- a/images/go-grpc-greeter-server/rootfs/go.sum
+++ b/images/go-grpc-greeter-server/rootfs/go.sum
@@ -10,27 +10,27 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
-go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
-go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
-go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
-go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
-go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
-go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
-go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
-go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
-go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
-google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
-google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
-google.golang.org/grpc/examples v0.0.0-20250625071442-a2d6045916b3 h1:EvDp6R1QibPTxbpHOr9MVdt0fOsZ9P+ry5wkvd3ObME=
-google.golang.org/grpc/examples v0.0.0-20250625071442-a2d6045916b3/go.mod h1:LEu4MhKupt/g4nRi+hCu5zfi4M84eGk0vBQLQKs9y9U=
+go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
+go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
+go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
+go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
+go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
+go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
+go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
+go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
+go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
+go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 h1:1ZwqphdOdWYXsUHgMpU/101nCtf/kSp9hOrcvFsnl10=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.74.0 h1:sxRSkyLxlceWQiqDofxDot3d4u7DyoHPc7SBXMj8gGY=
+google.golang.org/grpc v1.74.0/go.mod h1:NZUaK8dAMUfzhK6uxZ+9511LtOrk73UGWOFoNvz7z+s=
+google.golang.org/grpc/examples v0.0.0-20250716094922-0a12fb0d8439 h1:jGqtyxl0ww2NIm11M3nHcVbdedF9JDFoE1P9hHl0HLY=
+google.golang.org/grpc/examples v0.0.0-20250716094922-0a12fb0d8439/go.mod h1:+i5rXBPtOU+ow1bg9RANESbDoFozEtcAT9ikIOTjm84=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
diff --git a/images/kube-webhook-certgen/rootfs/go.mod b/images/kube-webhook-certgen/rootfs/go.mod
index 3b65ee3ab8..d69779d573 100644
--- a/images/kube-webhook-certgen/rootfs/go.mod
+++ b/images/kube-webhook-certgen/rootfs/go.mod
@@ -6,16 +6,16 @@ require (
github.com/onrik/logrus v0.11.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.9.1
- k8s.io/api v0.33.2
- k8s.io/apimachinery v0.33.2
- k8s.io/client-go v0.33.2
- k8s.io/kube-aggregator v0.33.2
+ k8s.io/api v0.33.3
+ k8s.io/apimachinery v0.33.3
+ k8s.io/client-go v0.33.3
+ k8s.io/kube-aggregator v0.33.3
)
require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
- github.com/fxamacker/cbor/v2 v2.8.0 // indirect
+ github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -34,13 +34,14 @@ require (
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
github.com/onsi/gomega v1.36.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
- github.com/spf13/pflag v1.0.6 // indirect
+ github.com/spf13/pflag v1.0.7 // indirect
github.com/x448/float16 v0.8.4 // indirect
- golang.org/x/net v0.41.0 // indirect
+ go.yaml.in/yaml/v2 v2.4.2 // indirect
+ golang.org/x/net v0.42.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
- golang.org/x/sys v0.33.0 // indirect
- golang.org/x/term v0.32.0 // indirect
- golang.org/x/text v0.26.0 // indirect
+ golang.org/x/sys v0.34.0 // indirect
+ golang.org/x/term v0.33.0 // indirect
+ golang.org/x/text v0.27.0 // indirect
golang.org/x/time v0.12.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
@@ -52,5 +53,5 @@ require (
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
- sigs.k8s.io/yaml v1.4.0 // indirect
+ sigs.k8s.io/yaml v1.5.0 // indirect
)
diff --git a/images/kube-webhook-certgen/rootfs/go.sum b/images/kube-webhook-certgen/rootfs/go.sum
index 276f7fa92d..3b668c66f7 100644
--- a/images/kube-webhook-certgen/rootfs/go.sum
+++ b/images/kube-webhook-certgen/rootfs/go.sum
@@ -5,8 +5,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
-github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
+github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-openapi/jsonpointer v0.21.1 h1:whnzv/pNXtK2FbX/W9yJfRmE2gsmkfahjMKB0fZvcic=
@@ -67,8 +67,9 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
+github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
@@ -88,6 +89,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
+go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
+go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
+go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -97,8 +102,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -108,22 +113,22 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
+golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
-golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -140,16 +145,16 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
-k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
-k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
-k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
-k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
+k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
+k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
+k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
+k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
+k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-aggregator v0.33.2 h1:eMW63PNucP+3UxnwYcfn5Yt2w2Sj2jI+imA7UWkYHVc=
-k8s.io/kube-aggregator v0.33.2/go.mod h1:qQbliLwcdmx7/8mtvkc/9QV/ON2M6ZBMcffEUmrqKFw=
+k8s.io/kube-aggregator v0.33.3 h1:Pa6hQpKJMX0p0D2wwcxXJgu02++gYcGWXoW1z1ZJDfo=
+k8s.io/kube-aggregator v0.33.3/go.mod h1:hwvkUoQ8q6gv0+SgNnlmQ3eUue1zHhJKTHsX7BwxwSE=
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
@@ -161,5 +166,6 @@ sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
-sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
+sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
+sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
From 8105f0861fbd69558e58c52f93540c81edad3a4f Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Thu, 17 Jul 2025 11:35:31 +0200
Subject: [PATCH 040/361] Chart: Remove trailing whitespace. (#13633)
---
.../ingress-nginx/tests/controller-service-internal_test.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/charts/ingress-nginx/tests/controller-service-internal_test.yaml b/charts/ingress-nginx/tests/controller-service-internal_test.yaml
index c0ece07d54..a44d974817 100644
--- a/charts/ingress-nginx/tests/controller-service-internal_test.yaml
+++ b/charts/ingress-nginx/tests/controller-service-internal_test.yaml
@@ -63,7 +63,7 @@ tests:
value: PreferClose
- it: should create a Service with labels if `controller.service.internal.labels` is set
- set:
+ set:
controller.service.internal.enabled: true
controller.service.internal.annotations:
test.annotation: "true"
From 23a4c209b4de7cc6ea2cce89a586a8825704cfb7 Mon Sep 17 00:00:00 2001
From: Adam Rudd <291016+adamvr@users.noreply.github.com>
Date: Fri, 18 Jul 2025 17:58:27 +0200
Subject: [PATCH 041/361] Docs: Improve `opentelemetry-trust-incoming-span`.
(#13606)
---
docs/user-guide/nginx-configuration/annotations.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/docs/user-guide/nginx-configuration/annotations.md b/docs/user-guide/nginx-configuration/annotations.md
index 82ad076626..85b3fa71f8 100755
--- a/docs/user-guide/nginx-configuration/annotations.md
+++ b/docs/user-guide/nginx-configuration/annotations.md
@@ -838,8 +838,11 @@ nginx.ingress.kubernetes.io/enable-opentelemetry: "true"
The option to trust incoming trace spans can be enabled or disabled globally through the ConfigMap but this will
sometimes need to be overridden to enable it or disable it for a specific ingress (e.g. only enable on a private endpoint)
+!!! note
+ This annotation requires `nginx.ingress.kubernetes.io/enable-opentelemetry` to be set to `"true"`, otherwise it will be ignored.
+
```yaml
-nginx.ingress.kubernetes.io/opentelemetry-trust-incoming-spans: "true"
+nginx.ingress.kubernetes.io/opentelemetry-trust-incoming-span: "true"
```
### X-Forwarded-Prefix Header
From 75a590772c763e5083344ba63d06d7c6982591f5 Mon Sep 17 00:00:00 2001
From: pando85
Date: Fri, 18 Jul 2025 18:56:26 +0200
Subject: [PATCH 042/361] Config/Annotations: Fix `proxy-busy-buffers-size`.
(#13610)
---
internal/ingress/annotations/proxy/main.go | 4 ++-
.../ingress/annotations/proxy/main_test.go | 25 ++++++++++++++++---
rootfs/etc/nginx/template/nginx.tmpl | 4 +++
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/internal/ingress/annotations/proxy/main.go b/internal/ingress/annotations/proxy/main.go
index aaa093eafd..45df90a5c0 100644
--- a/internal/ingress/annotations/proxy/main.go
+++ b/internal/ingress/annotations/proxy/main.go
@@ -301,9 +301,11 @@ func (a proxy) Parse(ing *networking.Ingress) (interface{}, error) {
config.BufferSize = defBackend.ProxyBufferSize
}
+ // Only set BusyBuffersSize if annotation is present, blank is NGINX default
+ // https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_busy_buffers_size
config.BusyBuffersSize, err = parser.GetStringAnnotation(proxyBusyBuffersSizeAnnotation, ing, a.annotationConfig.Annotations)
if err != nil {
- config.BusyBuffersSize = defBackend.ProxyBusyBuffersSize
+ config.BusyBuffersSize = ""
}
config.CookiePath, err = parser.GetStringAnnotation(proxyCookiePathAnnotation, ing, a.annotationConfig.Annotations)
diff --git a/internal/ingress/annotations/proxy/main_test.go b/internal/ingress/annotations/proxy/main_test.go
index b6ce07fb25..4728af770a 100644
--- a/internal/ingress/annotations/proxy/main_test.go
+++ b/internal/ingress/annotations/proxy/main_test.go
@@ -258,6 +258,9 @@ func TestProxyWithNoAnnotation(t *testing.T) {
if !ok {
t.Fatalf("expected a Config type")
}
+ if p.BusyBuffersSize != "" {
+ t.Errorf("expected empty BusyBuffersSize but returned %v", p.BusyBuffersSize)
+ }
if p.ConnectTimeout != 10 {
t.Errorf("expected 10 as connect-timeout but returned %v", p.ConnectTimeout)
}
@@ -273,9 +276,6 @@ func TestProxyWithNoAnnotation(t *testing.T) {
if p.BufferSize != "10k" {
t.Errorf("expected 10k as buffer-size but returned %v", p.BufferSize)
}
- if p.BusyBuffersSize != "15k" {
- t.Errorf("expected 15k as buffer-size but returned %v", p.BusyBuffersSize)
- }
if p.BodySize != "3k" {
t.Errorf("expected 3k as body-size but returned %v", p.BodySize)
}
@@ -298,3 +298,22 @@ func TestProxyWithNoAnnotation(t *testing.T) {
t.Errorf("expected 1024m as proxy-max-temp-file-size but returned %v", p.ProxyMaxTempFileSize)
}
}
+
+// Add a test for when annotation is set
+func TestProxyWithBusyBuffersSizeAnnotation(t *testing.T) {
+ ing := buildIngress()
+ data := map[string]string{}
+ data[parser.GetAnnotationWithPrefix("proxy-busy-buffers-size")] = "4k"
+ ing.SetAnnotations(data)
+ i, err := NewParser(mockBackend{}).Parse(ing)
+ if err != nil {
+ t.Fatalf("unexpected error parsing a valid")
+ }
+ p, ok := i.(*Config)
+ if !ok {
+ t.Fatalf("expected a Config type")
+ }
+ if p.BusyBuffersSize != "4k" {
+ t.Errorf("expected 4k as BusyBuffersSize but returned %v", p.BusyBuffersSize)
+ }
+}
diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
index e51eca0e92..965804a718 100644
--- a/rootfs/etc/nginx/template/nginx.tmpl
+++ b/rootfs/etc/nginx/template/nginx.tmpl
@@ -1076,7 +1076,9 @@ stream {
{{ end }}
proxy_buffer_size {{ $location.Proxy.BufferSize }};
proxy_buffers {{ $location.Proxy.BuffersNumber }} {{ $location.Proxy.BufferSize }};
+ {{ if $location.Proxy.BusyBuffersSize }}
proxy_busy_buffers_size {{ $location.Proxy.BusyBuffersSize }};
+ {{ end }}
proxy_request_buffering {{ $location.Proxy.RequestBuffering }};
proxy_ssl_server_name on;
@@ -1334,7 +1336,9 @@ stream {
proxy_buffering {{ $location.Proxy.ProxyBuffering }};
proxy_buffer_size {{ $location.Proxy.BufferSize }};
proxy_buffers {{ $location.Proxy.BuffersNumber }} {{ $location.Proxy.BufferSize }};
+ {{ if $location.Proxy.BusyBuffersSize }}
proxy_busy_buffers_size {{ $location.Proxy.BusyBuffersSize }};
+ {{ end }}
{{ if isValidByteSize $location.Proxy.ProxyMaxTempFileSize true }}
proxy_max_temp_file_size {{ $location.Proxy.ProxyMaxTempFileSize }};
{{ end }}
From f659cdf892d77b40790f2566abe281ab37f9bd96 Mon Sep 17 00:00:00 2001
From: Kyrre Havik
Date: Fri, 18 Jul 2025 19:14:27 +0200
Subject: [PATCH 043/361] Chart: Template default backend extra volumes.
(#13596)
---
.../templates/default-backend-deployment.yaml | 2 +-
.../default-backend-deployment_test.yaml | 23 +++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/charts/ingress-nginx/templates/default-backend-deployment.yaml b/charts/ingress-nginx/templates/default-backend-deployment.yaml
index 75c3d09cbf..a25dd4e247 100644
--- a/charts/ingress-nginx/templates/default-backend-deployment.yaml
+++ b/charts/ingress-nginx/templates/default-backend-deployment.yaml
@@ -118,6 +118,6 @@ spec:
{{- end }}
terminationGracePeriodSeconds: 60
{{- if .Values.defaultBackend.extraVolumes }}
- volumes: {{ toYaml .Values.defaultBackend.extraVolumes | nindent 8 }}
+ volumes: {{ tpl (toYaml .Values.defaultBackend.extraVolumes) $ | nindent 8 }}
{{- end }}
{{- end }}
diff --git a/charts/ingress-nginx/tests/default-backend-deployment_test.yaml b/charts/ingress-nginx/tests/default-backend-deployment_test.yaml
index 11d400c462..ed3bb87417 100644
--- a/charts/ingress-nginx/tests/default-backend-deployment_test.yaml
+++ b/charts/ingress-nginx/tests/default-backend-deployment_test.yaml
@@ -196,3 +196,26 @@ tests:
- equal:
path: spec.template.spec.automountServiceAccountToken
value: false
+
+ - it: should create a Deployment with extra volumes if `defaultBackend.extraVolumes` is set
+ set:
+ defaultBackend.enabled: true
+ defaultBackend.extraVolumes:
+ - name: extra-volume
+ configMap:
+ name: '{{ .Release.Name }}'
+ defaultBackend.extraVolumeMounts:
+ - name: extra-volume
+ mountPath: /extra
+ asserts:
+ - equal:
+ path: spec.template.spec.volumes
+ value:
+ - name: extra-volume
+ configMap:
+ name: RELEASE-NAME
+ - equal:
+ path: spec.template.spec.containers[0].volumeMounts
+ value:
+ - name: extra-volume
+ mountPath: /extra
From bdda29103d22913956662c8997a7c66ae26db9db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Jul 2025 13:48:22 +0200
Subject: [PATCH 044/361] Bump the actions group with 3 updates (#13639)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/junit-reports.yaml | 2 +-
.github/workflows/scorecards.yml | 2 +-
.github/workflows/vulnerability-scans.yaml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/junit-reports.yaml b/.github/workflows/junit-reports.yaml
index 17abcc8c72..eb46f7e629 100644
--- a/.github/workflows/junit-reports.yaml
+++ b/.github/workflows/junit-reports.yaml
@@ -13,7 +13,7 @@ jobs:
report:
runs-on: ubuntu-latest
steps:
- - uses: dorny/test-reporter@890a17cecf52a379fc869ab770a71657660be727 # v2.1.0
+ - uses: dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3 # v2.1.1
with:
artifact: /e2e-test-reports-(.*)/
name: JEST Tests $1 # Name of the check run which will be created
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 99c9fc029b..8cf705e6e3 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -59,6 +59,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
+ uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
with:
sarif_file: results.sarif
diff --git a/.github/workflows/vulnerability-scans.yaml b/.github/workflows/vulnerability-scans.yaml
index 8172d5d96b..f84e5f6dd6 100644
--- a/.github/workflows/vulnerability-scans.yaml
+++ b/.github/workflows/vulnerability-scans.yaml
@@ -60,7 +60,7 @@ jobs:
- name: Scan image with AquaSec/Trivy
id: scan
- uses: aquasecurity/trivy-action@76071ef0d7ec797419534a183b498b4d6366cf37 # v0.31.0
+ uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4 # v0.32.0
with:
image-ref: registry.k8s.io/ingress-nginx/controller:${{ matrix.versions }}
format: 'sarif'
@@ -75,7 +75,7 @@ jobs:
# This step checks out a copy of your repository.
- name: Upload SARIF file
- uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
+ uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
with:
token: ${{ github.token }}
# Path to SARIF file relative to the root of the repository
From bc92f8b52fc8be38d4be5793caf3f8594a31dc02 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Jul 2025 14:14:48 +0200
Subject: [PATCH 045/361] Bump github/codeql-action from 3.29.2 to 3.29.3 in
the actions group across 1 directory (#13642)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/scorecards.yml | 2 +-
.github/workflows/vulnerability-scans.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 8cf705e6e3..937c6f37d9 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -59,6 +59,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+ uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
with:
sarif_file: results.sarif
diff --git a/.github/workflows/vulnerability-scans.yaml b/.github/workflows/vulnerability-scans.yaml
index f84e5f6dd6..ed71813dbc 100644
--- a/.github/workflows/vulnerability-scans.yaml
+++ b/.github/workflows/vulnerability-scans.yaml
@@ -75,7 +75,7 @@ jobs:
# This step checks out a copy of your repository.
- name: Upload SARIF file
- uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+ uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
with:
token: ${{ github.token }}
# Path to SARIF file relative to the root of the repository
From ee00f72bc027ae9d679299ee37d1209c01c22305 Mon Sep 17 00:00:00 2001
From: Marco Ebert
Date: Tue, 22 Jul 2025 18:08:27 +0200
Subject: [PATCH 046/361] CI: Update KIND to v1.33.2. (#13646)
---
.github/workflows/ci.yaml | 6 +++---
.github/workflows/images.yaml | 2 +-
build/dev-env.sh | 2 +-
test/e2e/run-chart-test.sh | 2 +-
test/e2e/run-kind-e2e.sh | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f7820e6636..bcc32ea3f5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -271,7 +271,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- k8s: [v1.29.14, v1.30.13, v1.31.9, v1.32.5, v1.33.1]
+ k8s: [v1.29.14, v1.30.13, v1.31.9, v1.32.5, v1.33.2]
steps:
- name: Checkout code
@@ -303,7 +303,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- k8s: [v1.29.14, v1.30.13, v1.31.9, v1.32.5, v1.33.1]
+ k8s: [v1.29.14, v1.30.13, v1.31.9, v1.32.5, v1.33.2]
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
with:
k8s-version: ${{ matrix.k8s }}
@@ -318,7 +318,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- k8s: [v1.29.14, v1.30.13, v1.31.9, v1.32.5, v1.33.1]
+ k8s: [v1.29.14, v1.30.13, v1.31.9, v1.32.5, v1.33.2]
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
with:
k8s-version: ${{ matrix.k8s }}
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index e3a4168e10..2e07230867 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -136,7 +136,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- k8s: [v1.29.14, v1.30.13, v1.31.9, v1.32.5, v1.33.1]
+ k8s: [v1.29.14, v1.30.13, v1.31.9, v1.32.5, v1.33.2]
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/build/dev-env.sh b/build/dev-env.sh
index f1b170916a..48c139537c 100755
--- a/build/dev-env.sh
+++ b/build/dev-env.sh
@@ -64,7 +64,7 @@ echo "[dev-env] building image"
make build image
docker tag "${REGISTRY}/controller:${TAG}" "${DEV_IMAGE}"
-export K8S_VERSION=${K8S_VERSION:-v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f}
+export K8S_VERSION=${K8S_VERSION:-v1.33.2@sha256:c55080dc5be4f2cc242e6966fdf97bb62282e1cd818a28223cf536db8b0fddf4}
KIND_CLUSTER_NAME="ingress-nginx-dev"
diff --git a/test/e2e/run-chart-test.sh b/test/e2e/run-chart-test.sh
index 08b9a5ece7..88b2474ef7 100755
--- a/test/e2e/run-chart-test.sh
+++ b/test/e2e/run-chart-test.sh
@@ -62,7 +62,7 @@ export KUBECONFIG="${KUBECONFIG:-$HOME/.kube/kind-config-$KIND_CLUSTER_NAME}"
if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
echo "[dev-env] creating Kubernetes cluster with kind"
- export K8S_VERSION=${K8S_VERSION:-v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f}
+ export K8S_VERSION=${K8S_VERSION:-v1.33.2@sha256:c55080dc5be4f2cc242e6966fdf97bb62282e1cd818a28223cf536db8b0fddf4}
kind create cluster \
--verbosity=${KIND_LOG_LEVEL} \
diff --git a/test/e2e/run-kind-e2e.sh b/test/e2e/run-kind-e2e.sh
index a1440660e2..8d462c8d05 100755
--- a/test/e2e/run-kind-e2e.sh
+++ b/test/e2e/run-kind-e2e.sh
@@ -63,7 +63,7 @@ echo "Running e2e with nginx base image ${NGINX_BASE_IMAGE}"
if [ "${SKIP_CLUSTER_CREATION}" = "false" ]; then
echo "[dev-env] creating Kubernetes cluster with kind"
- export K8S_VERSION=${K8S_VERSION:-v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f}
+ export K8S_VERSION=${K8S_VERSION:-v1.33.2@sha256:c55080dc5be4f2cc242e6966fdf97bb62282e1cd818a28223cf536db8b0fddf4}
# delete the cluster if it exists
if kind get clusters | grep "${KIND_CLUSTER_NAME}"; then
From 9481de4988e48498e2007dad535c10a30046ecd9 Mon Sep 17 00:00:00 2001
From: Marcel
Date: Wed, 23 Jul 2025 10:26:28 +0200
Subject: [PATCH 047/361] Hack: Bump `golangci-lint` to v2.3.0. (#13650)
Co-authored-by: marcel2012 <13705842+marcel2012@users.noreply.github.com>
---
hack/verify-golint.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hack/verify-golint.sh b/hack/verify-golint.sh
index 17bcedd9fc..b2fb22df70 100755
--- a/hack/verify-golint.sh
+++ b/hack/verify-golint.sh
@@ -26,8 +26,8 @@ LINT=${LINT:-golangci-lint}
if [[ -z "$(command -v ${LINT})" ]]; then
echo "${LINT} is missing. Installing it now."
- # See: https://golangci-lint.run/usage/install/#local-installation
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
+ # See: https://golangci-lint.run/welcome/install/#local-installation
+ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.3.0
LINT=$(go env GOPATH)/bin/golangci-lint
fi
From d7c33ea648e295bb3c041813fdf0d039089c73b2 Mon Sep 17 00:00:00 2001
From: Marcel
Date: Wed, 23 Jul 2025 10:28:27 +0200
Subject: [PATCH 048/361] Docs: Update prerequisites in `getting-started.md`.
(#13651)
Co-authored-by: marcel2012 <13705842+marcel2012@users.noreply.github.com>
---
docs/developer-guide/getting-started.md | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/docs/developer-guide/getting-started.md b/docs/developer-guide/getting-started.md
index e4bb661d43..b070bab1dc 100644
--- a/docs/developer-guide/getting-started.md
+++ b/docs/developer-guide/getting-started.md
@@ -15,7 +15,7 @@ http request, termination of connection, reverseproxy etc. etc., you can skip th
Install [Go 1.14](https://golang.org/dl/) or later.
!!! note
- The project uses [Go Modules](https://github.com/golang/go/wiki/Modules)
+ The project uses [Go Modules](https://go.dev/wiki/Modules#modules)
Install [Docker](https://docs.docker.com/engine/install/) (v19.03.0 or later with experimental feature on)
@@ -23,6 +23,12 @@ Install [kubectl](https://kubernetes.io/docs/tasks/tools/) (1.24.0 or higher)
Install [Kind](https://kind.sigs.k8s.io/)
+Install [Helm](https://helm.sh/)
+
+Install jq
+
+Install make
+
!!! important
The majority of make tasks run as docker containers
From 01d3d80cfdcfa2a9f8f4b86457cbac852256c998 Mon Sep 17 00:00:00 2001
From: Marcel
Date: Wed, 23 Jul 2025 10:30:28 +0200
Subject: [PATCH 049/361] Make: Add `helm-test` target. (#13652)
Co-authored-by: marcel2012 <13705842+marcel2012@users.noreply.github.com>
---
Makefile | 4 ++++
docs/developer-guide/getting-started.md | 6 ++++++
2 files changed, 10 insertions(+)
diff --git a/Makefile b/Makefile
index 9cbbc91051..f7114e8201 100644
--- a/Makefile
+++ b/Makefile
@@ -156,6 +156,10 @@ test: ## Run go unit tests.
GOFLAGS="-buildvcs=false" \
test/test.sh
+.PHONY: helm-test
+helm-test: ## Run helm unit tests.
+ helm unittest charts/ingress-nginx --file "tests/**/*_test.yaml"
+
.PHONY: lua-test
lua-test: ## Run lua unit tests.
@build/run-in-docker.sh \
diff --git a/docs/developer-guide/getting-started.md b/docs/developer-guide/getting-started.md
index b070bab1dc..07a05fda03 100644
--- a/docs/developer-guide/getting-started.md
+++ b/docs/developer-guide/getting-started.md
@@ -88,6 +88,12 @@ Valid values are defined in the describe definition of the e2e tests like [Defau
The complete list of tests can be found [here](../e2e-tests.md)
+**Run Helm unit tests**
+
+```console
+make helm-test
+```
+
### Custom docker image
In some cases, it can be useful to build a docker image and publish such an image to a private or custom registry location.
From 801ea32ff64fcaf9881174cc3304e476e5ce7c8b Mon Sep 17 00:00:00 2001
From: Marcel
Date: Wed, 23 Jul 2025 10:37:34 +0200
Subject: [PATCH 050/361] Docs: Fix links and formatting in user guide.
(#13654)
Co-authored-by: marcel2012 <13705842+marcel2012@users.noreply.github.com>
---
docs/user-guide/basic-usage.md | 2 +-
.../nginx-configuration/annotations.md | 26 +++++++++----------
.../nginx-configuration/configmap.md | 7 ++---
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/docs/user-guide/basic-usage.md b/docs/user-guide/basic-usage.md
index aee0c0fd39..e29f1ef6c0 100644
--- a/docs/user-guide/basic-usage.md
+++ b/docs/user-guide/basic-usage.md
@@ -1,4 +1,4 @@
-# Basic usage - host based routing
+# Basic usage - host based routing
ingress-nginx can be used for many use cases, inside various cloud providers and supports a lot of configurations. In this section you can find a common usage scenario where a single load balancer powered by ingress-nginx will route traffic to 2 different HTTP backend services based on the host name.
diff --git a/docs/user-guide/nginx-configuration/annotations.md b/docs/user-guide/nginx-configuration/annotations.md
index 85b3fa71f8..132283ef15 100755
--- a/docs/user-guide/nginx-configuration/annotations.md
+++ b/docs/user-guide/nginx-configuration/annotations.md
@@ -446,15 +446,15 @@ kind: Ingress
metadata:
annotations:
nginx.ingress.kubernetes.io/server-snippet: |
- set $agentflag 0;
+ set $agentflag 0;
- if ($http_user_agent ~* "(Mobile)" ){
- set $agentflag 1;
- }
+ if ($http_user_agent ~* "(Mobile)" ){
+ set $agentflag 1;
+ }
- if ( $agentflag = 1 ) {
- return 301 https://m.example.com;
- }
+ if ( $agentflag = 1 ) {
+ return 301 https://m.example.com;
+ }
```
!!! attention
@@ -530,7 +530,7 @@ Additionally it is possible to set:
```yaml
nginx.ingress.kubernetes.io/auth-url: http://foo.com/external-auth
nginx.ingress.kubernetes.io/auth-snippet: |
- proxy_set_header Foo-Header 42;
+ proxy_set_header Foo-Header 42;
```
> Note: `nginx.ingress.kubernetes.io/auth-snippet` is an optional annotation. However, it may only be used in conjunction with `nginx.ingress.kubernetes.io/auth-url` and will be ignored if `nginx.ingress.kubernetes.io/auth-url` is not set
@@ -879,8 +879,8 @@ nginx.ingress.kubernetes.io/modsecurity-transaction-id: "$request_id"
You can also add your own set of modsecurity rules via a snippet:
```yaml
nginx.ingress.kubernetes.io/modsecurity-snippet: |
-SecRuleEngine On
-SecDebugLog /tmp/modsec_debug.log
+ SecRuleEngine On
+ SecDebugLog /tmp/modsec_debug.log
```
Note: If you use both `enable-owasp-core-rules` and `modsecurity-snippet` annotations together, only the
@@ -891,13 +891,13 @@ statement:
nginx 0.24.1 and below
```yaml
nginx.ingress.kubernetes.io/modsecurity-snippet: |
-Include /etc/nginx/owasp-modsecurity-crs/nginx-modsecurity.conf
-Include /etc/nginx/modsecurity/modsecurity.conf
+ Include /etc/nginx/owasp-modsecurity-crs/nginx-modsecurity.conf
+ Include /etc/nginx/modsecurity/modsecurity.conf
```
nginx 0.25.0 and above
```yaml
nginx.ingress.kubernetes.io/modsecurity-snippet: |
-Include /etc/nginx/owasp-modsecurity-crs/nginx-modsecurity.conf
+ Include /etc/nginx/owasp-modsecurity-crs/nginx-modsecurity.conf
```
### Backend Protocol
diff --git a/docs/user-guide/nginx-configuration/configmap.md b/docs/user-guide/nginx-configuration/configmap.md
index 87f6827861..87182beddd 100644
--- a/docs/user-guide/nginx-configuration/configmap.md
+++ b/docs/user-guide/nginx-configuration/configmap.md
@@ -73,7 +73,7 @@ The following table shows a configuration option's name, type, and the default v
| [enable-multi-accept](#enable-multi-accept) | bool | "true" | |
| [max-worker-connections](#max-worker-connections) | int | 16384 | |
| [max-worker-open-files](#max-worker-open-files) | int | 0 | |
-| [map-hash-bucket-size](#max-hash-bucket-size) | int | 64 | |
+| [map-hash-bucket-size](#map-hash-bucket-size) | int | 64 | |
| [nginx-status-ipv4-whitelist](#nginx-status-ipv4-whitelist) | []string | "127.0.0.1" | |
| [nginx-status-ipv6-whitelist](#nginx-status-ipv6-whitelist) | []string | "::1" | |
| [proxy-real-ip-cidr](#proxy-real-ip-cidr) | []string | "0.0.0.0/0" | |
@@ -1039,10 +1039,11 @@ Specifies the port to use when uploading traces. _**default:**_ 4317
Specifies the service name to use for any traces created. _**default:**_ nginx
-## opentelemetry-trust-incoming-span: "true"
+## opentelemetry-trust-incoming-span
+
Enables or disables using spans from incoming requests as parent for created ones. _**default:**_ true
-## otel-sampler-parent-based
+## otel-sampler-parent-based
Uses sampler implementation which by default will take a sample if parent Activity is sampled. _**default:**_ false
From 4e1b438988768f99f8f3fd186d7f5e11150219b1 Mon Sep 17 00:00:00 2001
From: Marcel
Date: Wed, 23 Jul 2025 10:44:27 +0200
Subject: [PATCH 051/361] Docs: Use HTTPS for NGINX links. (#13653)
Co-authored-by: marcel2012 <13705842+marcel2012@users.noreply.github.com>
---
NEW_CONTRIBUTOR.md | 8 +-
.../nginx-configuration/configmap.md | 10 +-
internal/ingress/annotations/authreq/main.go | 2 +-
.../ingress/annotations/ratelimit/main.go | 2 +-
internal/ingress/controller/config/config.go | 162 +++++++++---------
.../ingress/controller/template/template.go | 4 +-
internal/ingress/controller/util.go | 2 +-
internal/ingress/defaults/main.go | 52 +++---
internal/nginx/main.go | 2 +-
rootfs/etc/nginx/lua/util/split.lua | 2 +-
rootfs/etc/nginx/template/nginx.tmpl | 10 +-
test/data/cleanConf.expected.conf | 2 +-
test/data/cleanConf.src.conf | 2 +-
13 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/NEW_CONTRIBUTOR.md b/NEW_CONTRIBUTOR.md
index c9668430c3..94ba91dfc2 100644
--- a/NEW_CONTRIBUTOR.md
+++ b/NEW_CONTRIBUTOR.md
@@ -111,9 +111,9 @@ font-family: Tahoma, Verdana, Arial, sans-serif; }
working. Further configuration is required.
For online documentation and support please refer to
-nginx.org.
+nginx.org.
Commercial support is available at
-nginx.com.
+nginx.com.
Thank you for using nginx.