Merge pull request #5519 from woodcockjosh/fix-patch-ingress-deployme…

…nt-cause-pods-not-scheduled Fix pods not being scheduled when ingress deployment is patched
kubernetes · Oct 2, 2019 · 41b9bcb · 41b9bcb
2 parents 0788894 + e468bf9
commit 41b9bcb
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/deploy/addons/ingress/ingress-dp.yaml.tmpl b/deploy/addons/ingress/ingress-dp.yaml.tmpl
@@ -24,6 +24,12 @@ metadata:
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      # maxUnavailable needs to be 1 so that port conflicts between the old and new pod doesn't happen when using hostPort
+      maxUnavailable: 1
+      maxSurge: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: nginx-ingress-controller
@@ -42,7 +48,7 @@ spec:
       serviceAccountName: nginx-ingress
       terminationGracePeriodSeconds: 60
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller{{.ExoticArch}}:0.25.1
+      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller{{.ExoticArch}}:0.26.1
         name: nginx-ingress-controller
         imagePullPolicy: IfNotPresent
         readinessProbe: