Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog.d/5-internal/nginx-ingress-controller-upgrade
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade nginx-ingress-controller from 4.11.5 to 4.13.5 (k8s 1.29 - 1.33 officially supported - other version may also work)
2 changes: 1 addition & 1 deletion charts/ingress-nginx-controller/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ name: ingress-nginx-controller
version: 0.0.42
dependencies:
- name: ingress-nginx
version: 4.11.5 # k8s compatibility [1.26 - 1.30]
version: 4.13.5 # k8s compatibility [1.29 - 1.33]
repository: https://kubernetes.github.io/ingress-nginx
4 changes: 3 additions & 1 deletion charts/ingress-nginx-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# for all possible values to override.
ingress-nginx:
controller:
enableAnnotationValidations: false # due to https://github.com/kubernetes/ingress-nginx/issues/12709
enableTopologyAwareRouting: true
# Use kind: `DaemonSet` (when using NodePort) or `Deployment` (when using
# LoadBalancer)
Expand Down Expand Up @@ -56,4 +57,5 @@ ingress-nginx:
# Also add ssl/tls protocol/cipher to gain some observability here (can we turn off TLS 1.2?)
log-format-escape-json: true
log-format-upstream: '{"bytes_sent": "$bytes_sent", "duration": "$request_time", "http_referrer": "$http_referer", "http_user_agent": "$http_user_agent", "method": "$request_method", "path": "$uri", "remote_addr": "$proxy_protocol_addr", "remote_user": "$remote_user", "request_id": "$req_id", "request_length": "$request_length", "request_proto": "$server_protocol", "request_time": "$request_time", "status": "$status", "time": "$time_iso8601", "tls_cipher": "$ssl_cipher", "tls_protocol": "$ssl_protocol", "vhost": "$host", "x_forwarded_for": "$proxy_add_x_forwarded_for"}'
allowSnippetAnnotations: true
allow-snippet-annotations: true # new format for this flag in newer versions
allowSnippetAnnotations: true # needed up to and including version 1.13
6 changes: 6 additions & 0 deletions hack/helm_vars/ingress-nginx-controller/values.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
ingress-nginx:
fullnameOverride: "{{ .Release.Namespace }}-nginx-ingress"
controller:
# Must match the controllerValue on the IngressClass or the controller
# will ignore the ingress resources.
class: "k8s.io/{{ .Release.Namespace }}-nginx-ingress"
# Accept IngressClass names even if the IngressClass object is not found yet
# (controller still filters by the class string).
ingressClassByName: true
ingressClassResource:
name: "nginx-{{ .Release.Namespace }}"
# -- Is this ingressClass enabled or not
Expand Down