Merge pull request #8794 from olemarkus/automated-cherry-pick-of-#878…

…9-origin-release-1.17 Automated cherry pick of #8789: Make cilium operator health check go against localhost IP
kubernetes · Mar 25, 2020 · 81f44d2 · 81f44d2
2 parents 64d520c + 820d335
commit 81f44d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
@@ -677,6 +677,7 @@ spec:
 {{ end }}
         livenessProbe:
           httpGet:
+            host: "127.0.0.1"
             path: /healthz
             port: 9234
             scheme: HTTP

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -123,7 +123,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.cilium.io/k8s-1.12.yaml
-    manifestHash: 248ca9020966e6d7bcb0fe166e441171acc6147d
+    manifestHash: 7b948480cb8939d14717e39f94cfd6df842a1933
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"