1
0
mirror of https://github.com/rancher/rke.git synced 2025-08-08 10:18:10 +00:00

Update ingress nginx template yaml

This commit is contained in:
galal-hussein 2018-09-07 00:42:00 +02:00 committed by Alena Prokharchyk
parent 453ddd5213
commit 67448c38c6
2 changed files with 7 additions and 11 deletions

View File

@ -355,7 +355,6 @@ func (c *Cluster) deployIngress(ctx context.Context) error {
Options: c.Ingress.Options, Options: c.Ingress.Options,
NodeSelector: c.Ingress.NodeSelector, NodeSelector: c.Ingress.NodeSelector,
ExtraArgs: c.Ingress.ExtraArgs, ExtraArgs: c.Ingress.ExtraArgs,
AlpineImage: c.SystemImages.Alpine,
IngressImage: c.SystemImages.Ingress, IngressImage: c.SystemImages.Ingress,
IngressBackend: c.SystemImages.IngressBackend, IngressBackend: c.SystemImages.IngressBackend,
} }

View File

@ -193,16 +193,6 @@ spec:
{{if eq .RBACConfig "rbac"}} {{if eq .RBACConfig "rbac"}}
serviceAccountName: nginx-ingress-serviceaccount serviceAccountName: nginx-ingress-serviceaccount
{{ end }} {{ end }}
initContainers:
- command:
- sh
- -c
- sysctl -w net.core.somaxconn=32768; sysctl -w net.ipv4.ip_local_port_range="1024 65535"
image: {{.AlpineImage}}
imagePullPolicy: IfNotPresent
name: sysctl
securityContext:
privileged: true
containers: containers:
- name: nginx-ingress-controller - name: nginx-ingress-controller
image: {{.IngressImage}} image: {{.IngressImage}}
@ -213,6 +203,13 @@ spec:
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
- --udp-services-configmap=$(POD_NAMESPACE)/udp-services - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
- --annotations-prefix=nginx.ingress.kubernetes.io - --annotations-prefix=nginx.ingress.kubernetes.io
securityContext:
capabilities:
drop:
- ALL
add:
- NET_BIND_SERVICE
runAsUser: 33
{{ range $k, $v := .ExtraArgs }} {{ range $k, $v := .ExtraArgs }}
- --{{ $k }}{{if ne $v "" }}={{ $v }}{{end}} - --{{ $k }}{{if ne $v "" }}={{ $v }}{{end}}
{{ end }} {{ end }}