From 7bcf2d7831a70f8689aff07598e194f7dc11f459 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 29 Sep 2019 11:56:31 -0700 Subject: [PATCH] Update nginx-ingress from v0.25.1 to v0.26.1 * Add lifecycle hook to allow draining connections for up to 5 minutes --- CHANGES.md | 2 ++ addons/nginx-ingress/aws/deployment.yaml | 9 +++++++-- addons/nginx-ingress/azure/deployment.yaml | 9 +++++++-- addons/nginx-ingress/bare-metal/deployment.yaml | 9 +++++++-- addons/nginx-ingress/digital-ocean/daemonset.yaml | 9 +++++++-- addons/nginx-ingress/google-cloud/deployment.yaml | 9 +++++++-- 6 files changed, 37 insertions(+), 10 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fb9631c6..6263277b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -30,6 +30,8 @@ Notable changes between versions. #### Addons +* Update nginx-ingress from v0.25.1 to [v0.26.0](https://github.com/kubernetes/ingress-nginx/releases/tag/nginx-0.26.0) ([#555](https://github.com/poseidon/typhoon/pull/555)) + * Add lifecycle hook to allow draining for up to 5 minutes * Update Grafana from v6.3.5 to [v6.3.6](https://github.com/grafana/grafana/releases/tag/v6.3.6) ## v1.16.0 diff --git a/addons/nginx-ingress/aws/deployment.yaml b/addons/nginx-ingress/aws/deployment.yaml index 621c0e4d..3d1382e6 100644 --- a/addons/nginx-ingress/aws/deployment.yaml +++ b/addons/nginx-ingress/aws/deployment.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1 args: - /nginx-ingress-controller - --ingress-class=public @@ -65,6 +65,11 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 + lifecycle: + preStop: + exec: + command: + - /wait-shutdown securityContext: capabilities: add: @@ -73,4 +78,4 @@ spec: - ALL runAsUser: 33 # www-data restartPolicy: Always - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 300 diff --git a/addons/nginx-ingress/azure/deployment.yaml b/addons/nginx-ingress/azure/deployment.yaml index 621c0e4d..3d1382e6 100644 --- a/addons/nginx-ingress/azure/deployment.yaml +++ b/addons/nginx-ingress/azure/deployment.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1 args: - /nginx-ingress-controller - --ingress-class=public @@ -65,6 +65,11 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 + lifecycle: + preStop: + exec: + command: + - /wait-shutdown securityContext: capabilities: add: @@ -73,4 +78,4 @@ spec: - ALL runAsUser: 33 # www-data restartPolicy: Always - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 300 diff --git a/addons/nginx-ingress/bare-metal/deployment.yaml b/addons/nginx-ingress/bare-metal/deployment.yaml index 2e5c42f5..38b85c86 100644 --- a/addons/nginx-ingress/bare-metal/deployment.yaml +++ b/addons/nginx-ingress/bare-metal/deployment.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1 args: - /nginx-ingress-controller - --ingress-class=public @@ -62,6 +62,11 @@ spec: successThreshold: 1 failureThreshold: 3 timeoutSeconds: 5 + lifecycle: + preStop: + exec: + command: + - /wait-shutdown securityContext: capabilities: add: @@ -70,5 +75,5 @@ spec: - ALL runAsUser: 33 # www-data restartPolicy: Always - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 300 diff --git a/addons/nginx-ingress/digital-ocean/daemonset.yaml b/addons/nginx-ingress/digital-ocean/daemonset.yaml index 21abeb71..3c2bb74d 100644 --- a/addons/nginx-ingress/digital-ocean/daemonset.yaml +++ b/addons/nginx-ingress/digital-ocean/daemonset.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1 args: - /nginx-ingress-controller - --ingress-class=public @@ -65,6 +65,11 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 + lifecycle: + preStop: + exec: + command: + - /wait-shutdown securityContext: capabilities: add: @@ -73,4 +78,4 @@ spec: - ALL runAsUser: 33 # www-data restartPolicy: Always - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 300 diff --git a/addons/nginx-ingress/google-cloud/deployment.yaml b/addons/nginx-ingress/google-cloud/deployment.yaml index 621c0e4d..3d1382e6 100644 --- a/addons/nginx-ingress/google-cloud/deployment.yaml +++ b/addons/nginx-ingress/google-cloud/deployment.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1 args: - /nginx-ingress-controller - --ingress-class=public @@ -65,6 +65,11 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 + lifecycle: + preStop: + exec: + command: + - /wait-shutdown securityContext: capabilities: add: @@ -73,4 +78,4 @@ spec: - ALL runAsUser: 33 # www-data restartPolicy: Always - terminationGracePeriodSeconds: 60 + terminationGracePeriodSeconds: 300