diff --git a/cluster/addons.go b/cluster/addons.go index c537f8ec..919c9f5e 100644 --- a/cluster/addons.go +++ b/cluster/addons.go @@ -355,7 +355,6 @@ func (c *Cluster) deployIngress(ctx context.Context) error { Options: c.Ingress.Options, NodeSelector: c.Ingress.NodeSelector, ExtraArgs: c.Ingress.ExtraArgs, - AlpineImage: c.SystemImages.Alpine, IngressImage: c.SystemImages.Ingress, IngressBackend: c.SystemImages.IngressBackend, } diff --git a/templates/nginx-ingress.go b/templates/nginx-ingress.go index 810a105e..7c4e0db6 100644 --- a/templates/nginx-ingress.go +++ b/templates/nginx-ingress.go @@ -193,16 +193,6 @@ spec: {{if eq .RBACConfig "rbac"}} serviceAccountName: nginx-ingress-serviceaccount {{ 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: - name: nginx-ingress-controller image: {{.IngressImage}} @@ -213,6 +203,13 @@ spec: - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services - --udp-services-configmap=$(POD_NAMESPACE)/udp-services - --annotations-prefix=nginx.ingress.kubernetes.io + securityContext: + capabilities: + drop: + - ALL + add: + - NET_BIND_SERVICE + runAsUser: 33 {{ range $k, $v := .ExtraArgs }} - --{{ $k }}{{if ne $v "" }}={{ $v }}{{end}} {{ end }}