From 288ea10a594d6d3469c97b68eedd59414343cdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20P=C3=A9rez=20Hern=C3=A1ndez?= <jbperez@google.com>
Date: Tue, 16 Jul 2019 12:55:15 -0700
Subject: [PATCH] gce: configure: use 'amd64' in kube core images manifest

---
 cluster/gce/gci/configure.sh                           | 9 ---------
 cluster/gce/manifests/kube-apiserver.manifest          | 2 +-
 cluster/gce/manifests/kube-controller-manager.manifest | 2 +-
 cluster/gce/manifests/kube-proxy.manifest              | 2 +-
 cluster/gce/manifests/kube-scheduler.manifest          | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh
index bf7e1cd019f..1f768c3b50f 100644
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -381,15 +381,6 @@ function load-docker-images {
   else
     try-load-docker-image "${img_dir}/kube-proxy.tar"
   fi
-  # When we load from a docker archive, the image is tagged with the arch, we don't have docker manifests here.
-  # The resource manifest is expecting something like 'registry/kube-controller-manager:v1.2.3', no arch specified.
-  local -r images=$(docker images --format "{{.Repository}}:{{.Tag}}" | egrep 'kube-apiserver|kube-controller-manager|kube-scheduler|kube-proxy' | grep amd64)
-  for image in $images ; do
-    local manifest_name="${image/-amd64/}"
-    if ! docker images --format "{{.Repository}}:{{.Tag}}" | grep -q ${manifest_name} ; then
-      docker tag $image $manifest_name
-    fi
-  done
 }
 
 # Downloads kubernetes binaries and kube-system manifest tarball, unpacks them,
diff --git a/cluster/gce/manifests/kube-apiserver.manifest b/cluster/gce/manifests/kube-apiserver.manifest
index fc418c47488..300ded9e01f 100644
--- a/cluster/gce/manifests/kube-apiserver.manifest
+++ b/cluster/gce/manifests/kube-apiserver.manifest
@@ -18,7 +18,7 @@
 "containers":[
     {
     "name": "kube-apiserver",
-    "image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
+    "image": "{{pillar['kube_docker_registry']}}/kube-apiserver-amd64:{{pillar['kube-apiserver_docker_tag']}}",
     "resources": {
       "requests": {
         "cpu": "250m"
diff --git a/cluster/gce/manifests/kube-controller-manager.manifest b/cluster/gce/manifests/kube-controller-manager.manifest
index 8d8839c4266..3c7a7cf1290 100644
--- a/cluster/gce/manifests/kube-controller-manager.manifest
+++ b/cluster/gce/manifests/kube-controller-manager.manifest
@@ -18,7 +18,7 @@
 "containers":[
     {
     "name": "kube-controller-manager",
-    "image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
+    "image": "{{pillar['kube_docker_registry']}}/kube-controller-manager-amd64:{{pillar['kube-controller-manager_docker_tag']}}",
     "resources": {
       "requests": {
         "cpu": "{{cpurequest}}"
diff --git a/cluster/gce/manifests/kube-proxy.manifest b/cluster/gce/manifests/kube-proxy.manifest
index 7644461ad7f..bbde04a8a4c 100644
--- a/cluster/gce/manifests/kube-proxy.manifest
+++ b/cluster/gce/manifests/kube-proxy.manifest
@@ -16,7 +16,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-scheduler.manifest b/cluster/gce/manifests/kube-scheduler.manifest
index ab907f11daf..0f0a984806c 100644
--- a/cluster/gce/manifests/kube-scheduler.manifest
+++ b/cluster/gce/manifests/kube-scheduler.manifest
@@ -18,7 +18,7 @@
 "containers":[
     {
     "name": "kube-scheduler",
-    "image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
+    "image": "{{pillar['kube_docker_registry']}}/kube-scheduler-amd64:{{pillar['kube-scheduler_docker_tag']}}",
     "resources": {
       "requests": {
         "cpu": "{{cpurequest}}"