From d45dfdbf918f6d720042510c9ddfbc1d4a0740ff Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 29 Aug 2020 13:38:28 -0700 Subject: [PATCH] Update nginx-ingress from v0.34.1 to v0.35.0 * Repo changed to k8s.gcr.io/ingress-nginx/controller * https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v0.35.0 --- CHANGES.md | 5 ++++- addons/nginx-ingress/aws/deployment.yaml | 6 +++--- addons/nginx-ingress/azure/deployment.yaml | 6 +++--- addons/nginx-ingress/bare-metal/deployment.yaml | 9 ++++----- addons/nginx-ingress/digital-ocean/daemonset.yaml | 6 +++--- addons/nginx-ingress/google-cloud/deployment.yaml | 6 +++--- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ff43d0ab..7d4fc897 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,11 +10,14 @@ Notable changes between versions. ### Fedora CoreOS -* Fix SELinux label of bootstrap-secrets on non-bootstrapping controllers ([#808](https://github.com/poseidon/typhoon/pull/808)) +* Fix race condition during bootstrap of multi-controller clusters ([#808](https://github.com/poseidon/typhoon/pull/808)) + * Fix SELinux label of bootstrap-secrets on non-bootstrap controllers ### Addons * Introduce [fleetlock](https://github.com/poseidon/fleetlock) for Fedora CoreOS reboot coordination ([#814](https://github.com/poseidon/typhoon/pull/814)) +* Update nginx-ingress from v0.34.1 to [v0.35.0](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v0.35.0) + * Repository changed to `k8s.gcr.io/ingress-nginx/controller` * Update Grafana from v7.1.3 to [v7.1.5](https://github.com/grafana/grafana/releases/tag/v7.1.5) ## v1.18.8 diff --git a/addons/nginx-ingress/aws/deployment.yaml b/addons/nginx-ingress/aws/deployment.yaml index e07337d5..e32bfb1c 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: us.gcr.io/k8s-artifacts-prod/ingress-nginx/controller:v0.34.1 + image: k8s.gcr.io/ingress-nginx/controller:v0.35.0 args: - /nginx-ingress-controller - --ingress-class=public @@ -47,7 +47,6 @@ spec: containerPort: 10254 hostPort: 10254 livenessProbe: - failureThreshold: 3 httpGet: path: /healthz port: 10254 @@ -55,15 +54,16 @@ spec: initialDelaySeconds: 10 periodSeconds: 10 successThreshold: 1 + failureThreshold: 3 timeoutSeconds: 5 readinessProbe: - failureThreshold: 3 httpGet: path: /healthz port: 10254 scheme: HTTP periodSeconds: 10 successThreshold: 1 + failureThreshold: 3 timeoutSeconds: 5 lifecycle: preStop: diff --git a/addons/nginx-ingress/azure/deployment.yaml b/addons/nginx-ingress/azure/deployment.yaml index e07337d5..e32bfb1c 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: us.gcr.io/k8s-artifacts-prod/ingress-nginx/controller:v0.34.1 + image: k8s.gcr.io/ingress-nginx/controller:v0.35.0 args: - /nginx-ingress-controller - --ingress-class=public @@ -47,7 +47,6 @@ spec: containerPort: 10254 hostPort: 10254 livenessProbe: - failureThreshold: 3 httpGet: path: /healthz port: 10254 @@ -55,15 +54,16 @@ spec: initialDelaySeconds: 10 periodSeconds: 10 successThreshold: 1 + failureThreshold: 3 timeoutSeconds: 5 readinessProbe: - failureThreshold: 3 httpGet: path: /healthz port: 10254 scheme: HTTP periodSeconds: 10 successThreshold: 1 + failureThreshold: 3 timeoutSeconds: 5 lifecycle: preStop: diff --git a/addons/nginx-ingress/bare-metal/deployment.yaml b/addons/nginx-ingress/bare-metal/deployment.yaml index 6a49f3d8..be102c73 100644 --- a/addons/nginx-ingress/bare-metal/deployment.yaml +++ b/addons/nginx-ingress/bare-metal/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: ingress-controller-public + name: nginx-ingress-controller namespace: ingress spec: replicas: 2 @@ -10,19 +10,19 @@ spec: maxUnavailable: 1 selector: matchLabels: - name: ingress-controller-public + name: nginx-ingress-controller phase: prod template: metadata: labels: - name: ingress-controller-public + name: nginx-ingress-controller phase: prod annotations: seccomp.security.alpha.kubernetes.io/pod: 'docker/default' spec: containers: - name: nginx-ingress-controller - image: us.gcr.io/k8s-artifacts-prod/ingress-nginx/controller:v0.34.1 + image: k8s.gcr.io/ingress-nginx/controller:v0.35.0 args: - /nginx-ingress-controller - --ingress-class=public @@ -76,4 +76,3 @@ spec: runAsUser: 101 # www-data restartPolicy: Always terminationGracePeriodSeconds: 300 - diff --git a/addons/nginx-ingress/digital-ocean/daemonset.yaml b/addons/nginx-ingress/digital-ocean/daemonset.yaml index 538efbbe..2f26cf13 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: us.gcr.io/k8s-artifacts-prod/ingress-nginx/controller:v0.34.1 + image: k8s.gcr.io/ingress-nginx/controller:v0.35.0 args: - /nginx-ingress-controller - --ingress-class=public @@ -47,7 +47,6 @@ spec: containerPort: 10254 hostPort: 10254 livenessProbe: - failureThreshold: 3 httpGet: path: /healthz port: 10254 @@ -55,15 +54,16 @@ spec: initialDelaySeconds: 10 periodSeconds: 10 successThreshold: 1 + failureThreshold: 3 timeoutSeconds: 5 readinessProbe: - failureThreshold: 3 httpGet: path: /healthz port: 10254 scheme: HTTP periodSeconds: 10 successThreshold: 1 + failureThreshold: 3 timeoutSeconds: 5 lifecycle: preStop: diff --git a/addons/nginx-ingress/google-cloud/deployment.yaml b/addons/nginx-ingress/google-cloud/deployment.yaml index e07337d5..e32bfb1c 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: us.gcr.io/k8s-artifacts-prod/ingress-nginx/controller:v0.34.1 + image: k8s.gcr.io/ingress-nginx/controller:v0.35.0 args: - /nginx-ingress-controller - --ingress-class=public @@ -47,7 +47,6 @@ spec: containerPort: 10254 hostPort: 10254 livenessProbe: - failureThreshold: 3 httpGet: path: /healthz port: 10254 @@ -55,15 +54,16 @@ spec: initialDelaySeconds: 10 periodSeconds: 10 successThreshold: 1 + failureThreshold: 3 timeoutSeconds: 5 readinessProbe: - failureThreshold: 3 httpGet: path: /healthz port: 10254 scheme: HTTP periodSeconds: 10 successThreshold: 1 + failureThreshold: 3 timeoutSeconds: 5 lifecycle: preStop: