From 8582e19077395d4228f71ad028059810ca60551d Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 25 Oct 2017 22:29:20 -0700 Subject: [PATCH] Expand Nginx Ingress liveness and readiness probes * Remove dnsPolicy: ClusterFirst * https://github.com/kubernetes/ingress-nginx/pull/1584 --- addons/nginx-ingress/aws/deployment.yaml | 24 ++++++++++++------- .../digital-ocean/daemonset.yaml | 24 ++++++++++++------- .../google-cloud/deployment.yaml | 24 ++++++++++++------- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/addons/nginx-ingress/aws/deployment.yaml b/addons/nginx-ingress/aws/deployment.yaml index ea370159..059f63e8 100644 --- a/addons/nginx-ingress/aws/deployment.yaml +++ b/addons/nginx-ingress/aws/deployment.yaml @@ -16,6 +16,7 @@ spec: spec: nodeSelector: node-role.kubernetes.io/node: "" + hostNetwork: true containers: - name: nginx-ingress-controller image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.15 @@ -43,19 +44,24 @@ spec: - name: health containerPort: 10254 hostPort: 10254 - readinessProbe: - httpGet: - path: /healthz - port: 10254 - scheme: HTTP livenessProbe: - initialDelaySeconds: 11 - timeoutSeconds: 1 + failureThreshold: 3 httpGet: path: /healthz port: 10254 scheme: HTTP - hostNetwork: true - dnsPolicy: ClusterFirst + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + readinessProbe: + failureThreshold: 3 + httpGet: + path: /healthz + port: 10254 + scheme: HTTP + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 restartPolicy: Always terminationGracePeriodSeconds: 60 diff --git a/addons/nginx-ingress/digital-ocean/daemonset.yaml b/addons/nginx-ingress/digital-ocean/daemonset.yaml index 46332205..13513ad2 100644 --- a/addons/nginx-ingress/digital-ocean/daemonset.yaml +++ b/addons/nginx-ingress/digital-ocean/daemonset.yaml @@ -16,6 +16,7 @@ spec: spec: nodeSelector: node-role.kubernetes.io/node: "" + hostNetwork: true containers: - name: nginx-ingress-controller image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.15 @@ -43,19 +44,24 @@ spec: - name: health containerPort: 10254 hostPort: 10254 - readinessProbe: - httpGet: - path: /healthz - port: 10254 - scheme: HTTP livenessProbe: - initialDelaySeconds: 10 - timeoutSeconds: 1 + failureThreshold: 3 httpGet: path: /healthz port: 10254 scheme: HTTP - hostNetwork: true - dnsPolicy: ClusterFirst + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + readinessProbe: + failureThreshold: 3 + httpGet: + path: /healthz + port: 10254 + scheme: HTTP + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 restartPolicy: Always terminationGracePeriodSeconds: 60 diff --git a/addons/nginx-ingress/google-cloud/deployment.yaml b/addons/nginx-ingress/google-cloud/deployment.yaml index 04ce86cc..059f63e8 100644 --- a/addons/nginx-ingress/google-cloud/deployment.yaml +++ b/addons/nginx-ingress/google-cloud/deployment.yaml @@ -16,6 +16,7 @@ spec: spec: nodeSelector: node-role.kubernetes.io/node: "" + hostNetwork: true containers: - name: nginx-ingress-controller image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.15 @@ -43,19 +44,24 @@ spec: - name: health containerPort: 10254 hostPort: 10254 - readinessProbe: - httpGet: - path: /healthz - port: 10254 - scheme: HTTP livenessProbe: - initialDelaySeconds: 10 - timeoutSeconds: 1 + failureThreshold: 3 httpGet: path: /healthz port: 10254 scheme: HTTP - hostNetwork: true - dnsPolicy: ClusterFirst + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + readinessProbe: + failureThreshold: 3 + httpGet: + path: /healthz + port: 10254 + scheme: HTTP + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 restartPolicy: Always terminationGracePeriodSeconds: 60