Skip to content
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
646d7d8
chore(chart-deps): update ingress-nginx to version 4.13.1
svcAPLBot Aug 13, 2025
6e8c11c
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 13, 2025
31b79a0
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 14, 2025
eafe168
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 14, 2025
c68b76d
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 14, 2025
e17bbdf
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 15, 2025
7d29603
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 15, 2025
e8f7c4a
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 15, 2025
54c1fda
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 15, 2025
0149028
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 15, 2025
8cce0e8
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 15, 2025
6aeb384
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 18, 2025
b8907ae
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 18, 2025
4cc455c
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 18, 2025
7f19099
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 20, 2025
5e3eec4
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 25, 2025
cf14494
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 25, 2025
e3b435c
chore: cleaned up deprecated and replaced options
merll Aug 26, 2025
9110292
chore: simplify registry
merll Aug 26, 2025
4196e14
fix: set increased proxy-busy-buffers-size to match other settings
merll Aug 26, 2025
c9a337b
fix: extend namespace scope of ingress controller
merll Aug 26, 2025
083beee
fix: add allowed annotation level
merll Aug 27, 2025
7db40fa
chore: skip comment output
merll Aug 27, 2025
3b3501d
chore: removed unused annotation
merll Aug 27, 2025
026eb26
chore: clean up commented options
merll Aug 27, 2025
41ab2ea
feat: lower log verbosity
merll Aug 27, 2025
507aac1
fix: template comment syntax
merll Aug 27, 2025
665f571
fix: trailing comma
merll Aug 27, 2025
fe838d9
fix: use oauth2-proxy redirect
merll Aug 28, 2025
a4cd094
fix: include host
merll Aug 28, 2025
f40a403
fix: added scheme to redirect
merll Aug 28, 2025
f86dfae
chore: removed commented config
merll Aug 28, 2025
c1e4c8e
chore: dropped more defaults from explicit config
merll Aug 28, 2025
ce99d37
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 28, 2025
6631a0e
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 28, 2025
898145f
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Aug 28, 2025
0f13545
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 1, 2025
ce31097
fix: update remaining ingress after upgrade
merll Sep 1, 2025
6fd56a5
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 2, 2025
63b918e
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 2, 2025
ca50401
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 2, 2025
0533b7e
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 2, 2025
280a6cc
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 3, 2025
bd9704a
chore: move ingress-nginx post-upgrade to 4.12 release
merll Sep 4, 2025
f8dfa67
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 4, 2025
b54e547
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 5, 2025
1e54713
fix: add labels in pre-sync step
merll Sep 5, 2025
ed1ff6c
fix: merge label patch
merll Sep 5, 2025
cf9639e
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 5, 2025
0847214
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 8, 2025
443c8ba
Merge remote-tracking branch 'origin/main' into ci-update-ingress-ngi…
svcAPLBot Sep 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ appsInfo:
- Click 'I understand' to continue using Httpbin service
ingress-nginx:
title: Ingress-NGINX
appVersion: 1.11.6
appVersion: 1.13.1
repo: https://github.com/kubernetes/ingress-nginx
maintainers: NGINX
relatedLinks:
Expand Down
2 changes: 1 addition & 1 deletion chart/chart-index/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies:
version: 1.17.1
repository: https://helm.goharbor.io
- name: ingress-nginx
version: 4.11.6
version: 4.13.1
repository: https://kubernetes.github.io/ingress-nginx
- name: base
alias: istio-base
Expand Down
7 changes: 4 additions & 3 deletions charts/ingress-nginx/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
annotations:
artifacthub.io/changes: |
- Update Ingress-Nginx version controller-v1.11.6
- 'Make: Add `helm-test` target. (#13659)'
- Update Ingress-Nginx version controller-v1.13.1
artifacthub.io/prerelease: "false"
apiVersion: v2
appVersion: 1.11.6
appVersion: 1.13.1
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
load balancer
home: https://github.com/kubernetes/ingress-nginx
Expand All @@ -20,4 +21,4 @@ maintainers:
name: ingress-nginx
sources:
- https://github.com/kubernetes/ingress-nginx
version: 4.11.6
version: 4.13.1
72 changes: 39 additions & 33 deletions charts/ingress-nginx/README.md

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.10.3.md
Original file line number Diff line number Diff line change
@@ -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.10.3

* Update Ingress-Nginx version controller-v1.10.3

**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.10.2...helm-chart-4.10.3
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.10.4.md
Original file line number Diff line number Diff line change
@@ -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.10.4

* Update Ingress-Nginx version controller-v1.10.4

**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.10.3...helm-chart-4.10.4
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.10.5.md
Original file line number Diff line number Diff line change
@@ -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.10.5

* Update Ingress-Nginx version controller-v1.10.5

**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.10.4...helm-chart-4.10.5
10 changes: 10 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.10.6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# 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.10.6

* CI: Fix chart testing. (#12260)
* Update Ingress-Nginx version controller-v1.10.6

**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.10.5...helm-chart-4.10.6
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.11.7.md
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.11.8.md
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.12.0-beta.0.md
Original file line number Diff line number Diff line change
@@ -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.0-beta.0

* Update Ingress-Nginx version controller-v1.12.0-beta.0

**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.0...helm-chart-4.12.0-beta.0
10 changes: 10 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.12.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# 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.0

* CI: Fix chart testing. (#12258)
* Update Ingress-Nginx version controller-v1.12.0

**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.0...helm-chart-4.12.0
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.12.1.md
Original file line number Diff line number Diff line change
@@ -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.1

* Update Ingress-Nginx version controller-v1.12.1

**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.12.0...helm-chart-4.12.1
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.12.2.md
Original file line number Diff line number Diff line change
@@ -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.2

* Update Ingress-Nginx version controller-v1.12.2

**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.12.1...helm-chart-4.12.2
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.12.3.md
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.12.4.md
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.13.0.md
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions charts/ingress-nginx/changelog/helm-chart-4.13.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# 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.1

* Make: Add `helm-test` target. (#13659)
* Update Ingress-Nginx version controller-v1.13.1

**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.13.0...helm-chart-4.13.1

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ controller:

internal:
enabled: true
labels:
external-dns.alpha.kubernetes.io/hostname: internal.example.com
annotations:
service.beta.kubernetes.io/aws-load-balancer-internal: "true"
4 changes: 4 additions & 0 deletions charts/ingress-nginx/ci/controller-service-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ controller:
service:
type: NodePort

external:
labels:
external-dns.alpha.kubernetes.io/hostname: external.example.com

nodePorts:
tcp:
9000: 30090
Expand Down
13 changes: 0 additions & 13 deletions charts/ingress-nginx/ci/deamonset-psp-values.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions charts/ingress-nginx/ci/deamonset-webhook-and-psp-values.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions charts/ingress-nginx/ci/deployment-psp-values.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions charts/ingress-nginx/ci/deployment-webhook-and-psp-values.yaml

This file was deleted.

11 changes: 11 additions & 0 deletions charts/ingress-nginx/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
options:
# Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE
steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250513-9264efb079
dir: charts
env:
- NAME=ingress-nginx
entrypoint: make
args:
- push
13 changes: 2 additions & 11 deletions charts/ingress-nginx/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Controller container security context.
{{- else -}}
runAsNonRoot: {{ .Values.controller.image.runAsNonRoot }}
runAsUser: {{ .Values.controller.image.runAsUser }}
runAsGroup: {{ .Values.controller.image.runAsGroup }}
allowPrivilegeEscalation: {{ or .Values.controller.image.allowPrivilegeEscalation .Values.controller.image.chroot }}
{{- if .Values.controller.image.seccompProfile }}
seccompProfile: {{ toYaml .Values.controller.image.seccompProfile | nindent 2 }}
Expand Down Expand Up @@ -222,6 +223,7 @@ Default backend container security context.
{{- else -}}
runAsNonRoot: {{ .Values.defaultBackend.image.runAsNonRoot }}
runAsUser: {{ .Values.defaultBackend.image.runAsUser }}
runAsGroup: {{ .Values.defaultBackend.image.runAsGroup }}
allowPrivilegeEscalation: {{ .Values.defaultBackend.image.allowPrivilegeEscalation }}
{{- if .Values.defaultBackend.image.seccompProfile }}
seccompProfile: {{ toYaml .Values.defaultBackend.image.seccompProfile | nindent 2 }}
Expand All @@ -233,17 +235,6 @@ readOnlyRootFilesystem: {{ .Values.defaultBackend.image.readOnlyRootFilesystem }
{{- end -}}
{{- end -}}

{{/*
Return the appropriate apiGroup for PodSecurityPolicy.
*/}}
{{- define "podSecurityPolicy.apiGroup" -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- print "policy" -}}
{{- else -}}
{{- print "extensions" -}}
{{- end -}}
{{- end -}}

{{/*
Extra modules.
*/}}
Expand Down
Loading