diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 8d74da00f7..3cc1f9a4d3 100644 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 0.29.2 +version: 0.30.0 appVersion: 0.20.0 home: https://github.com/kubernetes/ingress-nginx description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration. diff --git a/stable/nginx-ingress/README.md b/stable/nginx-ingress/README.md index 1829cd0260..83e429b192 100644 --- a/stable/nginx-ingress/README.md +++ b/stable/nginx-ingress/README.md @@ -49,6 +49,7 @@ Parameter | Description | Default `controller.image.repository` | controller container image repository | `quay.io/kubernetes-ingress-controller/nginx-ingress-controller` `controller.image.tag` | controller container image tag | `0.20.0` `controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent` +`controller.image.runAsUser` | User ID of the controller process. Value depends on the Linux distribution used inside of the container image. By default uses debian one. | `33` `controller.config` | nginx ConfigMap entries | none `controller.hostNetwork` | If the nginx deployment / daemonset should run on the host's network namespace. Do not set this when `controller.service.externalIPs` is set and `kube-proxy` is used as there will be a port-conflict for port `80` | false `controller.defaultBackendService` | default 404 backend service; required only if `defaultBackend.enabled = false` | `""` diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index 8a56118b08..82e95e4bf2 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/stable/nginx-ingress/templates/controller-daemonset.yaml @@ -85,8 +85,7 @@ spec: - ALL add: - NET_BIND_SERVICE - # www-data -> 33 - runAsUser: 33 + runAsUser: {{ .Values.controller.image.runAsUser }} {{- end }} env: - name: POD_NAME diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index dd59450819..7d78507d33 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/stable/nginx-ingress/templates/controller-deployment.yaml @@ -87,8 +87,7 @@ spec: - ALL add: - NET_BIND_SERVICE - # www-data -> 33 - runAsUser: 33 + runAsUser: {{ .Values.controller.image.runAsUser }} {{- end }} env: - name: POD_NAME diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index 1ba669e346..894a54d554 100644 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -7,6 +7,8 @@ controller: repository: quay.io/kubernetes-ingress-controller/nginx-ingress-controller tag: "0.20.0" pullPolicy: IfNotPresent + # www-data -> uid 33 + runAsUser: 33 config: {} # Will add custom header to Nginx https://github.com/kubernetes/ingress-nginx/tree/master/docs/examples/customization/custom-headers