From 8d04fa065fcf2466e24ee1aa8165256d977967b4 Mon Sep 17 00:00:00 2001
From: Benjamin Elder <bentheelder@google.com>
Date: Thu, 25 Jul 2019 00:41:45 -0700
Subject: [PATCH 1/2] fix kube-proxy manifest

---
 cluster/addons/kube-proxy/kube-proxy-ds.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/addons/kube-proxy/kube-proxy-ds.yaml b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
index aaa9641d13f..f1857fa4a3c 100644
--- 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 }}

From 1cf8a06d12a51d0605b3588bc989dd921c6cacac Mon Sep 17 00:00:00 2001
From: Benjamin Elder <bentheelder@google.com>
Date: Thu, 25 Jul 2019 00:44:11 -0700
Subject: [PATCH 2/2] add reciprocal note about keeping manifests in sync

---
 cluster/gce/manifests/kube-proxy.manifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cluster/gce/manifests/kube-proxy.manifest b/cluster/gce/manifests/kube-proxy.manifest
index 1bdd395da1d..f26566cb3a0 100644
--- 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: