Skip to content

Commit 59980d1

Browse files
committed
feat: updated ingress_nginx helm chart to v4.11.5 (#2011)
(cherry picked from commit 4d81a61)
1 parent aa3f687 commit 59980d1

File tree

81 files changed

+655
-1008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+655
-1008
lines changed

chart/chart-index/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies:
3030
version: 1.16.2
3131
repository: https://helm.goharbor.io
3232
- name: ingress-nginx
33-
version: 4.11.2
33+
version: 4.11.5
3434
repository: https://kubernetes.github.io/ingress-nginx
3535
- name: jaeger-operator
3636
version: 2.46.0

charts/ingress-nginx/CHANGELOG.md

-460
This file was deleted.

charts/ingress-nginx/Chart.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
annotations:
22
artifacthub.io/changes: |
3-
- Update Ingress-Nginx version controller-v1.11.2
3+
- Update Ingress-Nginx version controller-v1.11.5
44
artifacthub.io/prerelease: "false"
55
apiVersion: v2
6-
appVersion: 1.11.2
6+
appVersion: 1.11.5
77
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
88
load balancer
99
home: https://github.com/kubernetes/ingress-nginx
@@ -15,11 +15,9 @@ kubeVersion: '>=1.21.0-0'
1515
maintainers:
1616
- name: cpanato
1717
- name: Gacko
18-
- name: puerco
19-
- name: rikatz
2018
- name: strongjz
2119
- name: tao12345666333
2220
name: ingress-nginx
2321
sources:
2422
- https://github.com/kubernetes/ingress-nginx
25-
version: 4.11.2
23+
version: 4.11.5

charts/ingress-nginx/OWNERS

-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
# See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
22

3-
approvers:
4-
- ingress-nginx-helm-maintainers
5-
6-
reviewers:
7-
- ingress-nginx-helm-reviewers
8-
93
labels:
104
- area/helm

charts/ingress-nginx/README.md

+27-9
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.11.2](https://img.shields.io/badge/Version-4.11.2-informational?style=flat-square) ![AppVersion: 1.11.2](https://img.shields.io/badge/AppVersion-1.11.2-informational?style=flat-square)
5+
![Version: 4.11.5](https://img.shields.io/badge/Version-4.11.5-informational?style=flat-square) ![AppVersion: 1.11.5](https://img.shields.io/badge/AppVersion-1.11.5-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

@@ -229,6 +229,24 @@ Detail of how and why are in [this issue](https://github.com/helm/charts/pull/13
229229

230230
As of version `1.26.0` of this chart, by simply not providing any clusterIP value, `invalid: spec.clusterIP: Invalid value: "": field is immutable` will no longer occur since `clusterIP: ""` will not be rendered.
231231

232+
### Pod Security Admission
233+
234+
You can use Pod Security Admission by applying labels to the `ingress-nginx` namespace as instructed by the [documentation](https://kubernetes.io/docs/tasks/configure-pod-container/enforce-standards-namespace-labels).
235+
236+
Example:
237+
238+
```yaml
239+
apiVersion: v1
240+
kind: Namespace
241+
metadata:
242+
name: ingress-nginx
243+
labels:
244+
kubernetes.io/metadata.name: ingress-nginx
245+
name: ingress-nginx
246+
pod-security.kubernetes.io/enforce: restricted
247+
pod-security.kubernetes.io/enforce-version: v1.31
248+
```
249+
232250
## Values
233251

234252
| Key | Type | Default | Description |
@@ -253,11 +271,11 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
253271
| controller.admissionWebhooks.namespaceSelector | object | `{}` | |
254272
| controller.admissionWebhooks.objectSelector | object | `{}` | |
255273
| controller.admissionWebhooks.patch.enabled | bool | `true` | |
256-
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3"` | |
274+
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:e8825994b7a2c7497375a9b945f386506ca6a3eda80b89b74ef2db743f66a5ea"` | |
257275
| controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` | |
258276
| controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` | |
259277
| controller.admissionWebhooks.patch.image.registry | string | `"registry.k8s.io"` | |
260-
| controller.admissionWebhooks.patch.image.tag | string | `"v1.4.3"` | |
278+
| controller.admissionWebhooks.patch.image.tag | string | `"v1.5.2"` | |
261279
| controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
262280
| controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
263281
| controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
@@ -325,16 +343,16 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
325343
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
326344
| controller.image.allowPrivilegeEscalation | bool | `false` | |
327345
| controller.image.chroot | bool | `false` | |
328-
| controller.image.digest | string | `"sha256:d5f8217feeac4887cb1ed21f27c2674e58be06bd8f5184cacea2a69abaf78dce"` | |
329-
| controller.image.digestChroot | string | `"sha256:21b55a2f0213a18b91612a8c0850167e00a8e34391fd595139a708f9c047e7a8"` | |
346+
| controller.image.digest | string | `"sha256:a1cbad75b0a7098bf9325132794dddf9eef917e8a7fe246749a4cea7ff6f01eb"` | |
347+
| controller.image.digestChroot | string | `"sha256:ec9df3eb6b06563a079ee46045da94cbf750f7dbb16fdbcb9e3265b551ed72ad"` | |
330348
| controller.image.image | string | `"ingress-nginx/controller"` | |
331349
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
332350
| controller.image.readOnlyRootFilesystem | bool | `false` | |
333351
| controller.image.registry | string | `"registry.k8s.io"` | |
334352
| controller.image.runAsNonRoot | bool | `true` | |
335353
| controller.image.runAsUser | int | `101` | |
336354
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
337-
| controller.image.tag | string | `"v1.11.2"` | |
355+
| controller.image.tag | string | `"v1.11.5"` | |
338356
| 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 |
339357
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
340358
| 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. |
@@ -366,7 +384,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
366384
| controller.livenessProbe.periodSeconds | int | `10` | |
367385
| controller.livenessProbe.successThreshold | int | `1` | |
368386
| controller.livenessProbe.timeoutSeconds | int | `1` | |
369-
| controller.maxmindLicenseKey | string | `""` | Maxmind license key to download GeoLite2 Databases. # https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases |
387+
| controller.maxmindLicenseKey | string | `""` | Maxmind license key to download GeoLite2 Databases. # https://blog.maxmind.com/2019/12/significant-changes-to-accessing-and-using-geolite2-databases/ |
370388
| controller.metrics.enabled | bool | `false` | |
371389
| controller.metrics.port | int | `10254` | |
372390
| controller.metrics.portName | string | `"metrics"` | |
@@ -380,7 +398,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
380398
| controller.metrics.service.servicePort | int | `10254` | |
381399
| controller.metrics.service.type | string | `"ClusterIP"` | |
382400
| controller.metrics.serviceMonitor.additionalLabels | object | `{}` | |
383-
| controller.metrics.serviceMonitor.annotations | object | `{}` | |
401+
| controller.metrics.serviceMonitor.annotations | object | `{}` | Annotations to be added to the ServiceMonitor. |
384402
| controller.metrics.serviceMonitor.enabled | bool | `false` | |
385403
| controller.metrics.serviceMonitor.metricRelabelings | list | `[]` | |
386404
| controller.metrics.serviceMonitor.namespace | string | `""` | |
@@ -515,7 +533,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
515533
| defaultBackend.livenessProbe.periodSeconds | int | `10` | |
516534
| defaultBackend.livenessProbe.successThreshold | int | `1` | |
517535
| defaultBackend.livenessProbe.timeoutSeconds | int | `5` | |
518-
| defaultBackend.minAvailable | int | `1` | |
536+
| defaultBackend.minAvailable | int | `1` | Minimum available pods set in PodDisruptionBudget. |
519537
| defaultBackend.minReadySeconds | int | `0` | `minReadySeconds` to avoid killing pods before we are ready # |
520538
| defaultBackend.name | string | `"defaultbackend"` | |
521539
| defaultBackend.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |

charts/ingress-nginx/README.md.gotmpl

+18
Original file line numberDiff line numberDiff line change
@@ -226,4 +226,22 @@ Detail of how and why are in [this issue](https://github.com/helm/charts/pull/13
226226

227227
As of version `1.26.0` of this chart, by simply not providing any clusterIP value, `invalid: spec.clusterIP: Invalid value: "": field is immutable` will no longer occur since `clusterIP: ""` will not be rendered.
228228

229+
### Pod Security Admission
230+
231+
You can use Pod Security Admission by applying labels to the `ingress-nginx` namespace as instructed by the [documentation](https://kubernetes.io/docs/tasks/configure-pod-container/enforce-standards-namespace-labels).
232+
233+
Example:
234+
235+
```yaml
236+
apiVersion: v1
237+
kind: Namespace
238+
metadata:
239+
name: ingress-nginx
240+
labels:
241+
kubernetes.io/metadata.name: ingress-nginx
242+
name: ingress-nginx
243+
pod-security.kubernetes.io/enforce: restricted
244+
pod-security.kubernetes.io/enforce-version: v1.31
245+
```
246+
229247
{{ template "chart.valuesSection" . }}

charts/ingress-nginx/changelog/.gitkeep

Whitespace-only changes.

charts/ingress-nginx/changelog/Changelog-4.5.2.md

-13
This file was deleted.

charts/ingress-nginx/changelog/Changelog-4.6.0.md

-24
This file was deleted.

charts/ingress-nginx/changelog/Changelog-4.6.1.md

-11
This file was deleted.

charts/ingress-nginx/changelog/helm-chart-4.1.2.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This file documents all notable changes to [ingress-nginx](https://github.com/ku
55
### 4.1.2
66

77
* [8587](https://github.com/kubernetes/ingress-nginx/pull/8587) Add CAP_SYS_CHROOT to DS/PSP when needed
8-
* [8458](https://github.com/kubernetes/ingress-nginx/pull/8458) Add portNamePreffix Helm chart parameter
8+
* [8458](https://github.com/kubernetes/ingress-nginx/pull/8458) Add portNamePrefix Helm chart parameter
99
* [8522](https://github.com/kubernetes/ingress-nginx/pull/8522) Add documentation for controller.service.loadBalancerIP in Helm chart
1010

1111
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.1.0...helm-chart-4.1.2

charts/ingress-nginx/changelog.md.gotmpl renamed to charts/ingress-nginx/changelog/helm-chart-4.11.3.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
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).
44

5-
### {{ .NewHelmChartVersion }}
6-
{{ with .HelmUpdates }}
7-
{{ range . }}* {{ . }}
8-
{{ end }}{{ end }}
9-
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-{{ .PreviousHelmChartVersion }}...helm-chart-{{ .NewHelmChartVersion }}
5+
### 4.11.3
6+
7+
* Update Ingress-Nginx version controller-v1.11.3
8+
9+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.2...helm-chart-4.11.3
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.11.4
6+
7+
* CI: Fix chart testing. (#12259)
8+
* Update Ingress-Nginx version controller-v1.11.4
9+
10+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.3...helm-chart-4.11.4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
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.11.5
6+
7+
* Update Ingress-Nginx version controller-v1.11.5
8+
9+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.4...helm-chart-4.11.5

charts/ingress-nginx/changelog/helm-chart-4.7.0.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file documents all notable changes to [ingress-nginx](https://github.com/ku
66

77
* helm: Fix opentelemetry module installation for daemonset (#9792)
88
* Update charts/* to keep project name display aligned (#9931)
9-
* HPA: Use capabilites & align manifests. (#9521)
9+
* HPA: Use capabilities & align manifests. (#9521)
1010
* PodDisruptionBudget spec logic update (#9904)
1111
* add option for annotations in PodDisruptionBudget (#9843)
1212
* Update Ingress-Nginx version controller-v1.8.0
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
controller:
2-
kind: DaemonSet
32
image:
43
repository: ingress-controller/controller
54
tag: 1.0.0-dev
65
digest: null
7-
admissionWebhooks:
8-
enabled: false
6+
97
service:
108
type: ClusterIP
9+
10+
admissionWebhooks:
11+
certManager:
12+
enabled: true

charts/ingress-nginx/ci/controller-admission-tls-cert-manager-values.yaml

-6
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
controller:
2+
image:
3+
repository: ingress-controller/controller
4+
tag: 1.0.0-dev
5+
digest: null
6+
7+
service:
8+
type: ClusterIP
9+
10+
addHeaders:
11+
X-Frame-Options: deny
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
controller:
2+
image:
3+
repository: ingress-controller/controller
4+
tag: 1.0.0-dev
5+
digest: null
6+
7+
service:
8+
type: ClusterIP
9+
10+
proxySetHeaders:
11+
X-Forwarded-Proto: https

charts/ingress-nginx/ci/deployment-customconfig-values.yaml renamed to charts/ingress-nginx/ci/controller-configmap-values.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ controller:
33
repository: ingress-controller/controller
44
tag: 1.0.0-dev
55
digest: null
6-
config:
7-
use-proxy-protocol: "true"
8-
allowSnippetAnnotations: false
9-
admissionWebhooks:
10-
enabled: false
6+
117
service:
128
type: ClusterIP
9+
10+
config:
11+
use-proxy-protocol: "true"

charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml

-7
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
controller:
2+
image:
3+
repository: ingress-controller/controller
4+
tag: 1.0.0-dev
5+
digest: null
6+
7+
service:
8+
type: ClusterIP
9+
10+
kind: DaemonSet
11+
12+
extraModules:
13+
- name: opentelemetry
14+
image:
15+
registry: registry.k8s.io
16+
image: ingress-nginx/opentelemetry-1.25.3
17+
tag: v20240813-b933310d
18+
digest: sha256:f7604ac0547ed64d79b98d92133234e66c2c8aade3c1f4809fed5eec1fb7f922
19+
distroless: true
20+
containerSecurityContext:
21+
runAsNonRoot: true
22+
runAsUser: 65532
23+
runAsGroup: 65532
24+
allowPrivilegeEscalation: false
25+
seccompProfile:
26+
type: RuntimeDefault
27+
capabilities:
28+
drop:
29+
- ALL
30+
readOnlyRootFilesystem: true
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
controller:
2-
kind: DaemonSet
32
image:
43
repository: ingress-controller/controller
54
tag: 1.0.0-dev
65
digest: null
7-
admissionWebhooks:
8-
enabled: true
6+
97
service:
108
type: ClusterIP
9+
10+
kind: DaemonSet
11+
12+
metrics:
13+
enabled: true

charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml renamed to charts/ingress-nginx/ci/controller-daemonset-opentelemetry-values.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ controller:
33
repository: ingress-controller/controller
44
tag: 1.0.0-dev
55
digest: null
6+
67
service:
78
type: ClusterIP
9+
10+
kind: DaemonSet
11+
812
opentelemetry:
913
enabled: true

0 commit comments

Comments
 (0)