Merge pull request #10861 from hakman/automated-cherry-pick-of-#10700-#…

…10856-upstream-release-1.19 Automated cherry pick of #10700: Fix rendering issue created by #10414 #10856: Add liveness probe for calico-kube-controllers
kubernetes · Feb 17, 2021 · c7f131c · c7f131c
2 parents 98fa781 + 778234f
commit c7f131c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 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
@@ -3632,7 +3632,7 @@ spec:
           name: calico-typha
           protocol: TCP
         {{- if .Networking.Calico.TyphaPrometheusMetricsEnabled }}
-        - containerPort: {{- or .Networking.Calico.TyphaPrometheusMetricsPort "9093" }}
+        - containerPort: {{ or .Networking.Calico.TyphaPrometheusMetricsPort "9093" }}
           name: metrics
           protocol: TCP
         {{- end }}
@@ -3976,7 +3976,7 @@ spec:
             periodSeconds: 10
           {{- if .Networking.Calico.PrometheusMetricsEnabled }}
           ports:
-          - containerPort: {{- or .Networking.Calico.PrometheusMetricsPort "9091" }}
+          - containerPort: {{ or .Networking.Calico.PrometheusMetricsPort "9091" }}
             name: metrics
             protocol: TCP
           {{- end }}
@@ -4112,6 +4112,12 @@ spec:
               command:
               - /usr/bin/check-status
               - -r
+          livenessProbe:
+            exec:
+              command:
+              - /usr/bin/check-status
+              - -r
+            failureThreshold: 10
 
 ---
 

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -858,7 +858,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
 			"k8s-1.7":    "2.6.12-kops.1",
 			"k8s-1.7-v3": "3.8.0-kops.2",
 			"k8s-1.12":   "3.9.6-kops.2",
-			"k8s-1.16":   "3.17.2-kops.1",
+			"k8s-1.16":   "3.17.2-kops.2",
 		}
 
 		{