Move ingress-nginx global values under new default structure (#593)

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/595/head
Derek Nola 2025-01-13 14:58:07 -08:00 committed by GitHub
parent e3a272ac9f
commit 679d2279e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 20 deletions

View File

@ -29,5 +29,5 @@
+{{- end -}} +{{- end -}}
+ +
+{{- define "repository_or_registry_and_image" -}} +{{- define "repository_or_registry_and_image" -}}
+{{- if .repository -}}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{- end -}}:{{ .tag }}{{- if (.digest) -}} @{{.digest}} {{- end -}} +{{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{ end }}:{{ .tag }}{{ if .digest }}@{{ .digest }}{{ end }}
+{{- end -}} +{{- end -}}

View File

@ -1,6 +1,16 @@
--- charts-original/values.yaml --- charts-original/values.yaml
+++ charts/values.yaml +++ charts/values.yaml
@@ -26,14 +26,11 @@ @@ -6,6 +6,9 @@
image:
# -- Registry host to pull images from.
registry: registry.k8s.io
+ systemDefaultRegistry: ""
+ systemDefaultIngressClass: ""
+
## Overrides for generated resource names
# See templates/_helpers.tpl
# nameOverride:
@@ -26,14 +29,11 @@
## Keep false as default for now! ## Keep false as default for now!
chroot: false chroot: false
# registry: registry.k8s.io # registry: registry.k8s.io
@ -17,7 +27,7 @@
runAsNonRoot: true runAsNonRoot: true
# -- This value must not be changed using the official image. # -- This value must not be changed using the official image.
# uid=101(www-data) gid=82(www-data) groups=82(www-data) # uid=101(www-data) gid=82(www-data) groups=82(www-data)
@@ -46,7 +43,7 @@ @@ -46,7 +46,7 @@
type: RuntimeDefault type: RuntimeDefault
readOnlyRootFilesystem: false readOnlyRootFilesystem: false
# -- Configures the controller container name # -- Configures the controller container name
@ -26,7 +36,7 @@
# -- Configures the ports that the nginx-controller listens on # -- Configures the ports that the nginx-controller listens on
containerPort: containerPort:
http: 80 http: 80
@@ -77,7 +74,7 @@ @@ -77,7 +77,7 @@
# -- Optionally change this to ClusterFirstWithHostNet in case you have 'hostNetwork: true'. # -- Optionally change this to ClusterFirstWithHostNet in case you have 'hostNetwork: true'.
# By default, while using host network, name resolution uses the host's DNS. If you wish nginx-controller # By default, while using host network, name resolution uses the host's DNS. If you wish nginx-controller
# to keep resolving names inside the k8s network, use ClusterFirstWithHostNet. # to keep resolving names inside the k8s network, use ClusterFirstWithHostNet.
@ -35,7 +45,7 @@
# -- Bare-metal considerations via the host network https://kubernetes.github.io/ingress-nginx/deploy/baremetal/#via-the-host-network # -- Bare-metal considerations via the host network https://kubernetes.github.io/ingress-nginx/deploy/baremetal/#via-the-host-network
# Ingress status was blank because there is no Service exposing the Ingress-Nginx Controller in a configuration using the host network, the default --publish-service flag used in standard cloud setups does not apply # Ingress status was blank because there is no Service exposing the Ingress-Nginx Controller in a configuration using the host network, the default --publish-service flag used in standard cloud setups does not apply
reportNodeInternalIp: false reportNodeInternalIp: false
@@ -107,7 +104,7 @@ @@ -107,7 +107,7 @@
## Disabled by default ## Disabled by default
hostPort: hostPort:
# -- Enable 'hostPort' or not # -- Enable 'hostPort' or not
@ -44,7 +54,7 @@
ports: ports:
# -- 'hostPort' http port # -- 'hostPort' http port
http: 80 http: 80
@@ -174,7 +171,7 @@ @@ -174,7 +174,7 @@
# node or nodes where an ingress controller pod is running. # node or nodes where an ingress controller pod is running.
publishService: publishService:
# -- Enable 'publishService' or not # -- Enable 'publishService' or not
@ -53,7 +63,7 @@
# -- Allows overriding of the publish service to bind to # -- Allows overriding of the publish service to bind to
# Must be <namespace>/<service_name> # Must be <namespace>/<service_name>
pathOverride: "" pathOverride: ""
@@ -221,7 +218,7 @@ @@ -221,7 +221,7 @@
# name: secret-resource # name: secret-resource
# -- Use a `DaemonSet` or `Deployment` # -- Use a `DaemonSet` or `Deployment`
@ -62,7 +72,7 @@
# -- Annotations to be added to the controller Deployment or DaemonSet # -- Annotations to be added to the controller Deployment or DaemonSet
## ##
annotations: {} annotations: {}
@@ -482,7 +479,7 @@ @@ -482,7 +482,7 @@
configMapKey: "" configMapKey: ""
service: service:
# -- Enable controller services or not. This does not influence the creation of either the admission webhook or the metrics service. # -- Enable controller services or not. This does not influence the creation of either the admission webhook or the metrics service.
@ -71,7 +81,7 @@
external: external:
# -- Enable the external controller service or not. Useful for internal-only deployments. # -- Enable the external controller service or not. Useful for internal-only deployments.
enabled: true enabled: true
@@ -752,6 +749,7 @@ @@ -752,6 +752,7 @@
loadBalancerSourceRanges: [] loadBalancerSourceRanges: []
servicePort: 443 servicePort: 443
type: ClusterIP type: ClusterIP
@ -79,7 +89,7 @@
createSecretJob: createSecretJob:
name: create name: create
# -- Security context for secret creation containers # -- Security context for secret creation containers
@@ -792,12 +790,11 @@ @@ -792,12 +793,11 @@
enabled: true enabled: true
image: image:
# registry: registry.k8s.io # registry: registry.k8s.io
@ -93,7 +103,7 @@
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# -- Provide a priority class name to the webhook patching job # -- Provide a priority class name to the webhook patching job
## ##
@@ -951,11 +948,11 @@ @@ -951,11 +951,11 @@
name: defaultbackend name: defaultbackend
image: image:
# registry: registry.k8s.io # registry: registry.k8s.io
@ -107,11 +117,3 @@
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
runAsNonRoot: true runAsNonRoot: true
# nobody user -> uid 65534 # nobody user -> uid 65534
@@ -1191,3 +1188,7 @@
# This can be generated with: `openssl dhparam 4096 2> /dev/null | base64`
## Ref: https://github.com/kubernetes/ingress-nginx/tree/main/docs/examples/customization/ssl-dh-param
dhParam: ""
+
+global:
+ systemDefaultRegistry: ""
+ systemDefaultIngressClass: ""

View File

@ -1,4 +1,4 @@
url: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-4.12.0/ingress-nginx-4.12.0.tgz url: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-4.12.0/ingress-nginx-4.12.0.tgz
packageVersion: 00 packageVersion: 01
# This repository does not use releaseCandidateVersions, so you can leave this as 00. # This repository does not use releaseCandidateVersions, so you can leave this as 00.
releaseCandidateVersion: 00 releaseCandidateVersion: 00