diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 7b03fad227..54a6e88870 100755 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 0.8.22 +version: 0.8.23 appVersion: 0.9.0-beta.15 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 diff --git a/stable/nginx-ingress/README.md b/stable/nginx-ingress/README.md index 7141c3958a..65740c6e56 100644 --- a/stable/nginx-ingress/README.md +++ b/stable/nginx-ingress/README.md @@ -60,6 +60,7 @@ Parameter | Description | Default `controller.extraArgs` | Additional controller container arguments | `{}` `controller.kind` | install as Deployment or DaemonSet | `Deployment` `controller.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]` +`controller.minReadySeconds` | how many seconds a pod needs to be ready before killing the next, during update | `0` `controller.nodeSelector` | node labels for pod assignment | `{}` `controller.podAnnotations` | annotations to be added to pods | `{}` `controller.replicaCount` | desired number of controller pods | `1` @@ -89,6 +90,7 @@ Parameter | Description | Default `controller.customTemplate.configMapName` | configMap containing a custom nginx template | `""` `controller.customTemplate.configMapKey` | configMap key containing the nginx template | `""` `controller.headers` | configMap key:value pairs containing the [custom headers](https://github.com/kubernetes/ingress-nginx/tree/master/docs/examples/customization/custom-headers) for Nginx | `{}` +`controller.updateStrategy` | allows setting of RollingUpdate strategy | `{}` `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` diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index e38ad4b165..b7329af784 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/stable/nginx-ingress/templates/controller-daemonset.yaml @@ -11,6 +11,9 @@ metadata: name: {{ template "nginx-ingress.controller.fullname" . }} spec: revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + updateStrategy: +{{ toYaml .Values.controller.updateStrategy | indent 4 }} + minReadySeconds: {{ .Values.controller.minReadySeconds }} template: metadata: annotations: diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index 0c60d3642c..7265a20711 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/stable/nginx-ingress/templates/controller-deployment.yaml @@ -14,6 +14,7 @@ spec: revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} strategy: {{ toYaml .Values.controller.updateStrategy | indent 4 }} + minReadySeconds: {{ .Values.controller.minReadySeconds }} template: metadata: annotations: diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index 21f304e2d8..1bf415a138 100644 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -71,6 +71,11 @@ controller: # maxUnavailable: 1 # type: RollingUpdate + # minReadySeconds to avoid killing pods before we are ready + ## + minReadySeconds: 0 + + ## Node tolerations for server scheduling to nodes with taints ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ ##