Merge pull request #10856 from hakman/calico-kube-controllers-restart

Add liveness probe for calico-kube-controllers
kubernetes · Feb 17, 2021 · 5bab92c · 5bab92c
2 parents 742c155 + f42f913
commit 5bab92c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
@@ -4112,12 +4112,12 @@ spec:
               command:
               - /usr/bin/check-status
               - -r
-          startupProbe:
+          livenessProbe:
             exec:
               command:
-                - /usr/bin/check-status
-                - -r
-            initialDelaySeconds: 10
+              - /usr/bin/check-status
+              - -r
+            failureThreshold: 10
 
 ---
 

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
@@ -762,7 +762,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
 		key := "networking.projectcalico.org"
 		versions := map[string]string{
 			"k8s-1.12": "3.9.6-kops.2",
-			"k8s-1.16": "3.17.2-kops.1",
+			"k8s-1.16": "3.17.2-kops.2",
 		}
 
 		{