Merge pull request #8741 from olemarkus/fix-kube-proxy-replacement

Set kube-proxy-replacement to partial

upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template

@@ -121,7 +121,7 @@ data:
   install-iptables-rules: "{{- if .IPTablesRulesNoinstall -}}false{{- else -}}true{{- end -}}"
   auto-direct-node-routes: "{{- if .AutoDirectNodeRoutes -}}true{{- else -}}false{{- end -}}"
   enable-node-port: "{{- if .EnableNodePort -}}true{{- else -}}false{{- end -}}"
-  kube-proxy-replacement: "{{- if .EnableNodePort -}}strict{{- else -}}disabled{{- end -}}"
+  kube-proxy-replacement: "{{- if .EnableNodePort -}}strict{{- else -}}partial{{- end -}}"
   {{ with .Ipam }}
   ipam: {{ . }}
   {{ if eq . "eni" }}

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml

@@ -97,7 +97,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.cilium.io/k8s-1.12.yaml
-    manifestHash: 77a1c4740beeaf403554fa4616809fa48fa07d78
+    manifestHash: ecb28739c283287eacd9863f1d057e5b09fabb1a
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"