Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

Commit

Permalink
[stable/nginx-ingress] Upgrade to 0.17.1 (#6745)
Browse files Browse the repository at this point in the history
* [stable/nginx-ingress] Added securityContext for controller daemonset
and deployment for 0.16+ versions.

* [stable/nginx-ingress] Updated to 0.16.2.

* [stable/nginx-ingress] Upgrade to 0.17.1.

* [stable/nginx-ingress] Upgraded defaultbackend to 1.4.

* [stable/nginx-ingress] README.md: Updated image tag versions.
  • Loading branch information
jpds authored and k8s-ci-robot committed Aug 7, 2018
1 parent 44639a1 commit cfb9ff7
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 6 deletions.
4 changes: 2 additions & 2 deletions stable/nginx-ingress/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: nginx-ingress
version: 0.23.1
appVersion: 0.15.0
version: 0.24.0
appVersion: 0.17.1
home: https://github.com/kubernetes/ingress-nginx
description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.
icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
Expand Down
4 changes: 2 additions & 2 deletions stable/nginx-ingress/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Parameter | Description | Default
--- | --- | ---
`controller.name` | name of the controller component | `controller`
`controller.image.repository` | controller container image repository | `quay.io/kubernetes-ingress-controller/nginx-ingress-controller`
`controller.image.tag` | controller container image tag | `0.15.0`
`controller.image.tag` | controller container image tag | `0.17.1`
`controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent`
`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
Expand Down Expand Up @@ -129,7 +129,7 @@ Parameter | Description | Default
`defaultBackend.enabled` | If false, controller.defaultBackendService must be provided | `true`
`defaultBackend.name` | name of the default backend component | `default-backend`
`defaultBackend.image.repository` | default backend container image repository | `k8s.gcr.io/defaultbackend`
`defaultBackend.image.tag` | default backend container image tag | `1.3`
`defaultBackend.image.tag` | default backend container image tag | `1.4`
`defaultBackend.image.pullPolicy` | default backend container image pull policy | `IfNotPresent`
`defaultBackend.extraArgs` | Additional default backend container arguments | `{}`
`defaultBackend.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]`
Expand Down
10 changes: 10 additions & 0 deletions stable/nginx-ingress/templates/controller-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,16 @@ spec:
- --{{ $key }}
{{- end }}
{{- end }}
{{- if (semverCompare ">=0.16.0" .Values.controller.image.tag) }}
securityContext:
capabilities:
drop:
- ALL
add:
- NET_BIND_SERVICE
# www-data -> 33
runAsUser: 33
{{- end }}
env:
- name: POD_NAME
valueFrom:
Expand Down
10 changes: 10 additions & 0 deletions stable/nginx-ingress/templates/controller-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,16 @@ spec:
- --{{ $key }}
{{- end }}
{{- end }}
{{- if (semverCompare ">=0.16.0" .Values.controller.image.tag) }}
securityContext:
capabilities:
drop:
- ALL
add:
- NET_BIND_SERVICE
# www-data -> 33
runAsUser: 33
{{- end }}
env:
- name: POD_NAME
valueFrom:
Expand Down
4 changes: 2 additions & 2 deletions stable/nginx-ingress/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ controller:
name: controller
image:
repository: quay.io/kubernetes-ingress-controller/nginx-ingress-controller
tag: "0.15.0"
tag: "0.17.1"
pullPolicy: IfNotPresent

config: {}
Expand Down Expand Up @@ -291,7 +291,7 @@ defaultBackend:
name: default-backend
image:
repository: k8s.gcr.io/defaultbackend
tag: "1.3"
tag: "1.4"
pullPolicy: IfNotPresent

extraArgs: {}
Expand Down

0 comments on commit cfb9ff7

Please sign in to comment.