Merge pull request kubernetes#80566 from BenTheElder/fix-image-ref

k8s-ci-robot · web-flow · commit 96594b6723bc · 2019-07-25T22:36:36.000-07:00
fix kube-proxy manifest
diff --git a/cluster/addons/kube-proxy/kube-proxy-ds.yaml b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
@@ -35,7 +35,7 @@ spec:
         effect: "NoSchedule"
       containers:
       - name: kube-proxy
-        image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
+        image: {{pillar['kube_docker_registry']}}/kube-proxy-amd64:{{pillar['kube-proxy_docker_tag']}}
         resources:
           requests:
             cpu: {{ cpurequest }}
diff --git a/cluster/gce/manifests/kube-proxy.manifest b/cluster/gce/manifests/kube-proxy.manifest
@@ -1,3 +1,5 @@
+# Please keep kube-proxy configuration in-sync with:
+# cluster/addons/kube-proxy/kube-proxy-ds.yaml
 apiVersion: v1
 kind: Pod
 metadata:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Please keep kube-proxy configuration in-sync with:`
	`2`	`+# cluster/addons/kube-proxy/kube-proxy-ds.yaml`
`1`	`3`	`apiVersion: v1`
`2`	`4`	`kind: Pod`
`3`	`5`	`metadata:`