Skip to content

Commit 4e97379

Browse files
strongjzstrongjz
authored
Release controller 1.9.6 and helm 4.9.1 (#10919)
Signed-off-by: James Strong <strong.james.e@gmail.com>
1 parent e8699bf commit 4e97379

File tree

29 files changed

+318
-436
lines changed

29 files changed

+318
-436
lines changed

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ the versions listed. Ingress-Nginx versions **may** work on older versions, but
3838

3939
| Supported | Ingress-NGINX version | k8s supported version | Alpine Version | Nginx Version | Helm Chart Version |
4040
|:--:|-----------------------|------------------------------|----------------|---------------|------------------------------|
41-
| 🔄 | **v1.9.5** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.9.0* |
41+
| 🔄 | **v1.9.6** | 1.29, 1.28, 1.27, 1.26, 1.25 | 3.19.0 | 1.21.6 | 4.9.1* |
42+
| 🔄 | **v1.9.5** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.9.0* |
4243
| 🔄 | **v1.9.4** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.3 |
4344
| 🔄 | **v1.9.3** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
4445
| 🔄 | **v1.9.1** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
@@ -47,8 +48,8 @@ the versions listed. Ingress-Nginx versions **may** work on older versions, but
4748
| 🔄 | **v1.8.2** | 1.27, 1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
4849
| 🔄 | **v1.8.1** | 1.27, 1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
4950
| 🔄 | **v1.8.0** | 1.27, 1.26, 1.25, 1.24 | 3.18.0 | 1.21.6 | 4.7.* |
50-
| 🔄 | **v1.7.1** | 1.27, 1.26, 1.25, 1.24 | 3.17.2 | 1.21.6 | 4.6.* |
51-
| 🔄 | **v1.7.0** | 1.26, 1.25, 1.24 | 3.17.2 | 1.21.6 | 4.6.* |
51+
| | **v1.7.1** | 1.27, 1.26, 1.25, 1.24 | 3.17.2 | 1.21.6 | 4.6.* |
52+
| | **v1.7.0** | 1.26, 1.25, 1.24 | 3.17.2 | 1.21.6 | 4.6.* |
5253
| | v1.6.4 | 1.26, 1.25, 1.24, 1.23 | 3.17.0 | 1.21.6 | 4.5.* |
5354
| | v1.5.1 | 1.25, 1.24, 1.23 | 3.16.2 | 1.21.6 | 4.4.* |
5455
| | v1.4.0 | 1.25, 1.24, 1.23, 1.22 | 3.16.2 | 1.19.10† | 4.3.0 |

‎changelog/controller-1.9.6.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Changelog
2+
3+
### controller-v1.9.6
4+
5+
Images:
6+
7+
* registry.k8s.io/ingress-nginx/controller:v1.9.6@sha256:1405cc613bd95b2c6edd8b2a152510ae91c7e62aea4698500d23b2145960ab9c
8+
* registry.k8s.io/ingress-nginx/controller-chroot:v1.9.6@sha256:7eb46ff733429e0e46892903c7394aff149ac6d284d92b3946f3baf7ff26a096
9+
10+
### All changes:
11+
12+
* update web hook cert gen to latest release v20231226-1a7112e06
13+
* annotation validation: validate regex in common name annotation (#10880)
14+
* change MODSECURITY_VERSION_LIB to 3.0.11 (#10879)
15+
* Include SECLEVEL and STRENGTH as part of ssl-cipher list validation (#10871)
16+
17+
### Dependency updates:
18+
19+
* Bump github.com/opencontainers/runc from 1.1.10 to 1.1.11 (#10878)
20+
21+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.9.5...controller-v1.9.6

‎changelog/controller.md.gotmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ Images:
1919
* {{ . }}
2020
{{- end }}
2121
{{ end }}
22-
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-{{ .PreviousControllerVersion }}...controller-{{ .NewControllerVersion }}
22+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/{{ .PreviousControllerVersion }}...{{ .NewControllerVersion }}

‎charts/ingress-nginx/Chart.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
annotations:
22
artifacthub.io/changes: |-
3-
- "Add controller.metrics.serviceMonitor.annotations in Helm chart"
4-
- "fix(labels): use complete labels variable on default-backend deployment"
5-
- "chart: allow setting allocateLoadBalancerNodePorts (#10693)"
6-
- "[release-1.9] feat(helm): add documentation about metric args (#10695)"
7-
- "Update Ingress-Nginx version controller-v1.9.5"
3+
- "update web hook cert gen to latest release v20231226-1a7112e06"
4+
- "Update Ingress-Nginx version controller-v1.9.6"
85
artifacthub.io/prerelease: "false"
96
apiVersion: v2
10-
appVersion: 1.9.5
7+
appVersion: 1.9.6
118
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
129
load balancer
1310
home: https://github.com/kubernetes/ingress-nginx
@@ -17,11 +14,10 @@ keywords:
1714
- nginx
1815
kubeVersion: '>=1.20.0-0'
1916
maintainers:
20-
- name: Gacko
2117
- name: rikatz
2218
- name: strongjz
2319
- name: tao12345666333
2420
name: ingress-nginx
2521
sources:
2622
- https://github.com/kubernetes/ingress-nginx
27-
version: 4.9.0
23+
version: 4.9.1

‎charts/ingress-nginx/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
44

5-
![Version: 4.9.0](https://img.shields.io/badge/Version-4.9.0-informational?style=flat-square) ![AppVersion: 1.9.5](https://img.shields.io/badge/AppVersion-1.9.5-informational?style=flat-square)
5+
![Version: 4.9.1](https://img.shields.io/badge/Version-4.9.1-informational?style=flat-square) ![AppVersion: 1.9.6](https://img.shields.io/badge/AppVersion-1.9.6-informational?style=flat-square)
66

77
To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
88

@@ -253,11 +253,11 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
253253
| controller.admissionWebhooks.namespaceSelector | object | `{}` | |
254254
| controller.admissionWebhooks.objectSelector | object | `{}` | |
255255
| controller.admissionWebhooks.patch.enabled | bool | `true` | |
256-
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:a7943503b45d552785aa3b5e457f169a5661fb94d82b8a3373bcd9ebaf9aac80"` | |
256+
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:25d6a5f11211cc5c3f9f2bf552b585374af287b4debf693cacbe2da47daa5084"` | |
257257
| controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` | |
258258
| controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` | |
259259
| controller.admissionWebhooks.patch.image.registry | string | `"registry.k8s.io"` | |
260-
| controller.admissionWebhooks.patch.image.tag | string | `"v20231011-8b53cabe0"` | |
260+
| controller.admissionWebhooks.patch.image.tag | string | `"v20231226-1a7112e06"` | |
261261
| controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
262262
| controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
263263
| controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
@@ -317,16 +317,16 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
317317
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
318318
| controller.image.allowPrivilegeEscalation | bool | `false` | |
319319
| controller.image.chroot | bool | `false` | |
320-
| controller.image.digest | string | `"sha256:b3aba22b1da80e7acfc52b115cae1d4c687172cbf2b742d5b502419c25ff340e"` | |
321-
| controller.image.digestChroot | string | `"sha256:9a8d7b25a846a6461cd044b9aea9cf6cad972bcf2e64d9fd246c0279979aad2d"` | |
320+
| controller.image.digest | string | `"sha256:1405cc613bd95b2c6edd8b2a152510ae91c7e62aea4698500d23b2145960ab9c"` | |
321+
| controller.image.digestChroot | string | `"sha256:7eb46ff733429e0e46892903c7394aff149ac6d284d92b3946f3baf7ff26a096"` | |
322322
| controller.image.image | string | `"ingress-nginx/controller"` | |
323323
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
324324
| controller.image.readOnlyRootFilesystem | bool | `false` | |
325325
| controller.image.registry | string | `"registry.k8s.io"` | |
326326
| controller.image.runAsNonRoot | bool | `true` | |
327327
| controller.image.runAsUser | int | `101` | |
328328
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
329-
| controller.image.tag | string | `"v1.9.5"` | |
329+
| controller.image.tag | string | `"v1.9.6"` | |
330330
| 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 |
331331
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
332332
| controller.ingressClassResource.controllerValue | string | `"k8s.io/ingress-nginx"` | Controller-value of the controller that is processing this ingressClass |

‎charts/ingress-nginx/changelog/helm-chart-4.9.1.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Changelog
2+
3+
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+
5+
### 4.9.1
6+
7+
* - "update web hook cert gen to latest release v20231226-1a7112e06"
8+
* - "Update Ingress-Nginx version controller-v1.9.6"
9+
10+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.9.0...helm-chart-4.9.1

‎charts/ingress-nginx/values.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ controller:
2626
## for backwards compatibility consider setting the full image url via the repository value below
2727
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
2828
## repository:
29-
tag: "v1.9.5"
30-
digest: sha256:b3aba22b1da80e7acfc52b115cae1d4c687172cbf2b742d5b502419c25ff340e
31-
digestChroot: sha256:9a8d7b25a846a6461cd044b9aea9cf6cad972bcf2e64d9fd246c0279979aad2d
29+
tag: "v1.9.6"
30+
digest: sha256:1405cc613bd95b2c6edd8b2a152510ae91c7e62aea4698500d23b2145960ab9c
31+
digestChroot: sha256:7eb46ff733429e0e46892903c7394aff149ac6d284d92b3946f3baf7ff26a096
3232
pullPolicy: IfNotPresent
3333
runAsNonRoot: true
3434
# www-data -> uid 101
@@ -781,8 +781,8 @@ controller:
781781
## for backwards compatibility consider setting the full image url via the repository value below
782782
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
783783
## repository:
784-
tag: v20231011-8b53cabe0
785-
digest: sha256:a7943503b45d552785aa3b5e457f169a5661fb94d82b8a3373bcd9ebaf9aac80
784+
tag: v20231226-1a7112e06
785+
digest: sha256:25d6a5f11211cc5c3f9f2bf552b585374af287b4debf693cacbe2da47daa5084
786786
pullPolicy: IfNotPresent
787787
# -- Provide a priority class name to the webhook patching job
788788
##

‎deploy/static/provider/aws/deploy.yaml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
app.kubernetes.io/instance: ingress-nginx
1616
app.kubernetes.io/name: ingress-nginx
1717
app.kubernetes.io/part-of: ingress-nginx
18-
app.kubernetes.io/version: 1.9.5
18+
app.kubernetes.io/version: 1.9.6
1919
name: ingress-nginx
2020
namespace: ingress-nginx
2121
---
@@ -27,7 +27,7 @@ metadata:
2727
app.kubernetes.io/instance: ingress-nginx
2828
app.kubernetes.io/name: ingress-nginx
2929
app.kubernetes.io/part-of: ingress-nginx
30-
app.kubernetes.io/version: 1.9.5
30+
app.kubernetes.io/version: 1.9.6
3131
name: ingress-nginx-admission
3232
namespace: ingress-nginx
3333
---
@@ -39,7 +39,7 @@ metadata:
3939
app.kubernetes.io/instance: ingress-nginx
4040
app.kubernetes.io/name: ingress-nginx
4141
app.kubernetes.io/part-of: ingress-nginx
42-
app.kubernetes.io/version: 1.9.5
42+
app.kubernetes.io/version: 1.9.6
4343
name: ingress-nginx
4444
namespace: ingress-nginx
4545
rules:
@@ -129,7 +129,7 @@ metadata:
129129
app.kubernetes.io/instance: ingress-nginx
130130
app.kubernetes.io/name: ingress-nginx
131131
app.kubernetes.io/part-of: ingress-nginx
132-
app.kubernetes.io/version: 1.9.5
132+
app.kubernetes.io/version: 1.9.6
133133
name: ingress-nginx-admission
134134
namespace: ingress-nginx
135135
rules:
@@ -148,7 +148,7 @@ metadata:
148148
app.kubernetes.io/instance: ingress-nginx
149149
app.kubernetes.io/name: ingress-nginx
150150
app.kubernetes.io/part-of: ingress-nginx
151-
app.kubernetes.io/version: 1.9.5
151+
app.kubernetes.io/version: 1.9.6
152152
name: ingress-nginx
153153
rules:
154154
- apiGroups:
@@ -230,7 +230,7 @@ metadata:
230230
app.kubernetes.io/instance: ingress-nginx
231231
app.kubernetes.io/name: ingress-nginx
232232
app.kubernetes.io/part-of: ingress-nginx
233-
app.kubernetes.io/version: 1.9.5
233+
app.kubernetes.io/version: 1.9.6
234234
name: ingress-nginx-admission
235235
rules:
236236
- apiGroups:
@@ -249,7 +249,7 @@ metadata:
249249
app.kubernetes.io/instance: ingress-nginx
250250
app.kubernetes.io/name: ingress-nginx
251251
app.kubernetes.io/part-of: ingress-nginx
252-
app.kubernetes.io/version: 1.9.5
252+
app.kubernetes.io/version: 1.9.6
253253
name: ingress-nginx
254254
namespace: ingress-nginx
255255
roleRef:
@@ -269,7 +269,7 @@ metadata:
269269
app.kubernetes.io/instance: ingress-nginx
270270
app.kubernetes.io/name: ingress-nginx
271271
app.kubernetes.io/part-of: ingress-nginx
272-
app.kubernetes.io/version: 1.9.5
272+
app.kubernetes.io/version: 1.9.6
273273
name: ingress-nginx-admission
274274
namespace: ingress-nginx
275275
roleRef:
@@ -288,7 +288,7 @@ metadata:
288288
app.kubernetes.io/instance: ingress-nginx
289289
app.kubernetes.io/name: ingress-nginx
290290
app.kubernetes.io/part-of: ingress-nginx
291-
app.kubernetes.io/version: 1.9.5
291+
app.kubernetes.io/version: 1.9.6
292292
name: ingress-nginx
293293
roleRef:
294294
apiGroup: rbac.authorization.k8s.io
@@ -307,7 +307,7 @@ metadata:
307307
app.kubernetes.io/instance: ingress-nginx
308308
app.kubernetes.io/name: ingress-nginx
309309
app.kubernetes.io/part-of: ingress-nginx
310-
app.kubernetes.io/version: 1.9.5
310+
app.kubernetes.io/version: 1.9.6
311311
name: ingress-nginx-admission
312312
roleRef:
313313
apiGroup: rbac.authorization.k8s.io
@@ -328,7 +328,7 @@ metadata:
328328
app.kubernetes.io/instance: ingress-nginx
329329
app.kubernetes.io/name: ingress-nginx
330330
app.kubernetes.io/part-of: ingress-nginx
331-
app.kubernetes.io/version: 1.9.5
331+
app.kubernetes.io/version: 1.9.6
332332
name: ingress-nginx-controller
333333
namespace: ingress-nginx
334334
---
@@ -344,7 +344,7 @@ metadata:
344344
app.kubernetes.io/instance: ingress-nginx
345345
app.kubernetes.io/name: ingress-nginx
346346
app.kubernetes.io/part-of: ingress-nginx
347-
app.kubernetes.io/version: 1.9.5
347+
app.kubernetes.io/version: 1.9.6
348348
name: ingress-nginx-controller
349349
namespace: ingress-nginx
350350
spec:
@@ -377,7 +377,7 @@ metadata:
377377
app.kubernetes.io/instance: ingress-nginx
378378
app.kubernetes.io/name: ingress-nginx
379379
app.kubernetes.io/part-of: ingress-nginx
380-
app.kubernetes.io/version: 1.9.5
380+
app.kubernetes.io/version: 1.9.6
381381
name: ingress-nginx-controller-admission
382382
namespace: ingress-nginx
383383
spec:
@@ -400,7 +400,7 @@ metadata:
400400
app.kubernetes.io/instance: ingress-nginx
401401
app.kubernetes.io/name: ingress-nginx
402402
app.kubernetes.io/part-of: ingress-nginx
403-
app.kubernetes.io/version: 1.9.5
403+
app.kubernetes.io/version: 1.9.6
404404
name: ingress-nginx-controller
405405
namespace: ingress-nginx
406406
spec:
@@ -422,7 +422,7 @@ spec:
422422
app.kubernetes.io/instance: ingress-nginx
423423
app.kubernetes.io/name: ingress-nginx
424424
app.kubernetes.io/part-of: ingress-nginx
425-
app.kubernetes.io/version: 1.9.5
425+
app.kubernetes.io/version: 1.9.6
426426
spec:
427427
containers:
428428
- args:
@@ -446,7 +446,7 @@ spec:
446446
fieldPath: metadata.namespace
447447
- name: LD_PRELOAD
448448
value: /usr/local/lib/libmimalloc.so
449-
image: registry.k8s.io/ingress-nginx/controller:v1.9.5@sha256:b3aba22b1da80e7acfc52b115cae1d4c687172cbf2b742d5b502419c25ff340e
449+
image: registry.k8s.io/ingress-nginx/controller:v1.9.6@sha256:1405cc613bd95b2c6edd8b2a152510ae91c7e62aea4698500d23b2145960ab9c
450450
imagePullPolicy: IfNotPresent
451451
lifecycle:
452452
preStop:
@@ -522,7 +522,7 @@ metadata:
522522
app.kubernetes.io/instance: ingress-nginx
523523
app.kubernetes.io/name: ingress-nginx
524524
app.kubernetes.io/part-of: ingress-nginx
525-
app.kubernetes.io/version: 1.9.5
525+
app.kubernetes.io/version: 1.9.6
526526
name: ingress-nginx-admission-create
527527
namespace: ingress-nginx
528528
spec:
@@ -533,7 +533,7 @@ spec:
533533
app.kubernetes.io/instance: ingress-nginx
534534
app.kubernetes.io/name: ingress-nginx
535535
app.kubernetes.io/part-of: ingress-nginx
536-
app.kubernetes.io/version: 1.9.5
536+
app.kubernetes.io/version: 1.9.6
537537
name: ingress-nginx-admission-create
538538
spec:
539539
containers:
@@ -547,7 +547,7 @@ spec:
547547
valueFrom:
548548
fieldRef:
549549
fieldPath: metadata.namespace
550-
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20231011-8b53cabe0@sha256:a7943503b45d552785aa3b5e457f169a5661fb94d82b8a3373bcd9ebaf9aac80
550+
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20231226-1a7112e06@sha256:25d6a5f11211cc5c3f9f2bf552b585374af287b4debf693cacbe2da47daa5084
551551
imagePullPolicy: IfNotPresent
552552
name: create
553553
securityContext:
@@ -573,7 +573,7 @@ metadata:
573573
app.kubernetes.io/instance: ingress-nginx
574574
app.kubernetes.io/name: ingress-nginx
575575
app.kubernetes.io/part-of: ingress-nginx
576-
app.kubernetes.io/version: 1.9.5
576+
app.kubernetes.io/version: 1.9.6
577577
name: ingress-nginx-admission-patch
578578
namespace: ingress-nginx
579579
spec:
@@ -584,7 +584,7 @@ spec:
584584
app.kubernetes.io/instance: ingress-nginx
585585
app.kubernetes.io/name: ingress-nginx
586586
app.kubernetes.io/part-of: ingress-nginx
587-
app.kubernetes.io/version: 1.9.5
587+
app.kubernetes.io/version: 1.9.6
588588
name: ingress-nginx-admission-patch
589589
spec:
590590
containers:
@@ -600,7 +600,7 @@ spec:
600600
valueFrom:
601601
fieldRef:
602602
fieldPath: metadata.namespace
603-
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20231011-8b53cabe0@sha256:a7943503b45d552785aa3b5e457f169a5661fb94d82b8a3373bcd9ebaf9aac80
603+
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20231226-1a7112e06@sha256:25d6a5f11211cc5c3f9f2bf552b585374af287b4debf693cacbe2da47daa5084
604604
imagePullPolicy: IfNotPresent
605605
name: patch
606606
securityContext:
@@ -626,7 +626,7 @@ metadata:
626626
app.kubernetes.io/instance: ingress-nginx
627627
app.kubernetes.io/name: ingress-nginx
628628
app.kubernetes.io/part-of: ingress-nginx
629-
app.kubernetes.io/version: 1.9.5
629+
app.kubernetes.io/version: 1.9.6
630630
name: nginx
631631
spec:
632632
controller: k8s.io/ingress-nginx
@@ -639,7 +639,7 @@ metadata:
639639
app.kubernetes.io/instance: ingress-nginx
640640
app.kubernetes.io/name: ingress-nginx
641641
app.kubernetes.io/part-of: ingress-nginx
642-
app.kubernetes.io/version: 1.9.5
642+
app.kubernetes.io/version: 1.9.6
643643
name: ingress-nginx-admission
644644
webhooks:
645645
- admissionReviewVersions:

0 commit comments

Comments
 (0)