Expand Nginx Ingress liveness and readiness probes

* Remove dnsPolicy: ClusterFirst
* https://github.com/kubernetes/ingress-nginx/pull/1584

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
+            failureThreshold: 3
-            timeoutSeconds: 1
             httpGet:
               path: /healthz
               port: 10254
               scheme: HTTP
-      hostNetwork: true
+            initialDelaySeconds: 10
-      dnsPolicy: ClusterFirst
+            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

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
+            failureThreshold: 3
-            timeoutSeconds: 1
             httpGet:
               path: /healthz
               port: 10254
               scheme: HTTP
-      hostNetwork: true
+            initialDelaySeconds: 10
-      dnsPolicy: ClusterFirst
+            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

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
+            failureThreshold: 3
-            timeoutSeconds: 1
             httpGet:
               path: /healthz
               port: 10254
               scheme: HTTP
-      hostNetwork: true
+            initialDelaySeconds: 10
-      dnsPolicy: ClusterFirst
+            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