mirror of https://git.rancher.io/rke2-charts
136 lines
5.8 KiB
Diff
136 lines
5.8 KiB
Diff
--- charts-original/values.yaml
|
|
+++ charts/values.yaml
|
|
@@ -18,14 +18,11 @@
|
|
image:
|
|
## Keep false as default for now!
|
|
chroot: false
|
|
- registry: registry.k8s.io
|
|
- image: ingress-nginx/controller
|
|
+ repository: rancher/nginx-ingress-controller
|
|
## for backwards compatibility consider setting the full image url via the repository value below
|
|
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
|
|
## repository:
|
|
- tag: "v1.7.1"
|
|
- digest: sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407
|
|
- digestChroot: sha256:e35d5ab487861b9d419c570e3530589229224a0762c7b4d2e2222434abb8d988
|
|
+ tag: "nginx-1.7.1-hardened1"
|
|
pullPolicy: IfNotPresent
|
|
# www-data -> uid 101
|
|
runAsUser: 101
|
|
@@ -33,7 +30,7 @@
|
|
# -- Use an existing PSP instead of creating one
|
|
existingPsp: ""
|
|
# -- Configures the controller container name
|
|
- containerName: controller
|
|
+ containerName: rke2-ingress-nginx-controller
|
|
# -- Configures the ports that the nginx-controller listens on
|
|
containerPort:
|
|
http: 80
|
|
@@ -53,14 +50,14 @@
|
|
# -- 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
|
|
# to keep resolving names inside the k8s network, use ClusterFirstWithHostNet.
|
|
- dnsPolicy: ClusterFirst
|
|
+ dnsPolicy: ClusterFirstWithHostNet
|
|
# -- 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 NGINX Ingress controller in a configuration using the host network, the default --publish-service flag used in standard cloud setups does not apply
|
|
reportNodeInternalIp: false
|
|
# -- Process Ingress objects without ingressClass annotation/ingressClassName field
|
|
# Overrides value for --watch-ingress-without-class flag of the controller binary
|
|
# Defaults to false
|
|
- watchIngressWithoutClass: false
|
|
+ watchIngressWithoutClass: true
|
|
# -- Process IngressClass per name (additionally as per spec.controller).
|
|
ingressClassByName: false
|
|
# -- This configuration enables Topology Aware Routing feature, used together with service annotation service.kubernetes.io/topology-aware-hints="auto"
|
|
@@ -70,7 +67,7 @@
|
|
# their own *-snippet annotations, otherwise this is forbidden / dropped
|
|
# when users add those annotations.
|
|
# Global snippets in ConfigMap are still respected
|
|
- allowSnippetAnnotations: true
|
|
+ allowSnippetAnnotations: false
|
|
# -- Required for use with CNI based kubernetes installations (such as ones set up by kubeadm),
|
|
# since CNI and hostport don't mix yet. Can be deprecated once https://github.com/kubernetes/kubernetes/issues/23920
|
|
# is merged
|
|
@@ -79,7 +76,7 @@
|
|
## Disabled by default
|
|
hostPort:
|
|
# -- Enable 'hostPort' or not
|
|
- enabled: false
|
|
+ enabled: true
|
|
ports:
|
|
# -- 'hostPort' http port
|
|
http: 80
|
|
@@ -122,7 +119,7 @@
|
|
# node or nodes where an ingress controller pod is running.
|
|
publishService:
|
|
# -- Enable 'publishService' or not
|
|
- enabled: true
|
|
+ enabled: false
|
|
# -- Allows overriding of the publish service to bind to
|
|
# Must be <namespace>/<service_name>
|
|
pathOverride: ""
|
|
@@ -166,7 +163,7 @@
|
|
# name: secret-resource
|
|
|
|
# -- Use a `DaemonSet` or `Deployment`
|
|
- kind: Deployment
|
|
+ kind: DaemonSet
|
|
# -- Annotations to be added to the controller Deployment or DaemonSet
|
|
##
|
|
annotations: {}
|
|
@@ -404,7 +401,7 @@
|
|
configMapName: ""
|
|
configMapKey: ""
|
|
service:
|
|
- enabled: true
|
|
+ enabled: false
|
|
# -- If enabled is adding an appProtocol option for Kubernetes service. An appProtocol field replacing annotations that were
|
|
# using for setting a backend protocol. Here is an example for AWS: service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
|
|
# It allows choosing the protocol for each backend specified in the Kubernetes service.
|
|
@@ -587,6 +584,7 @@
|
|
loadBalancerSourceRanges: []
|
|
servicePort: 443
|
|
type: ClusterIP
|
|
+ ipFamilyPolicy: "PreferDualStack"
|
|
createSecretJob:
|
|
securityContext:
|
|
allowPrivilegeEscalation: false
|
|
@@ -604,13 +602,11 @@
|
|
patch:
|
|
enabled: true
|
|
image:
|
|
- registry: registry.k8s.io
|
|
- image: ingress-nginx/kube-webhook-certgen
|
|
+ repository: rancher/mirrored-ingress-nginx-kube-webhook-certgen
|
|
## for backwards compatibility consider setting the full image url via the repository value below
|
|
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
|
|
## repository:
|
|
tag: v20230312-helm-chart-4.5.2-28-g66a760794
|
|
- digest: sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f
|
|
pullPolicy: IfNotPresent
|
|
# -- Provide a priority class name to the webhook patching job
|
|
##
|
|
@@ -738,12 +734,11 @@
|
|
enabled: false
|
|
name: defaultbackend
|
|
image:
|
|
- registry: registry.k8s.io
|
|
- image: defaultbackend-amd64
|
|
+ repository: rancher/nginx-ingress-controller-defaultbackend
|
|
## for backwards compatibility consider setting the full image url via the repository value below
|
|
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
|
|
## repository:
|
|
- tag: "1.5"
|
|
+ tag: "1.5-rancher1"
|
|
pullPolicy: IfNotPresent
|
|
# nobody user -> uid 65534
|
|
runAsUser: 65534
|
|
@@ -898,3 +893,6 @@
|
|
# 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: ""
|