From 1790589f7093dfb7e65248905060d36342b34295 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 6 May 2019 14:02:59 -0700
Subject: [PATCH] Replace ARCH sed macros with Go templates

---
 Makefile                                      | 21 +------------------
 deploy/addons/addon-manager.template          |  2 +-
 deploy/addons/ingress/ingress-dp.template     |  4 ++--
 .../storage-provisioner.template              |  2 +-
 pkg/minikube/assets/addons.go                 |  3 +++
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index ca19f49aa..0790c71ee 100755
--- a/Makefile
+++ b/Makefile
@@ -100,25 +100,6 @@ ifeq ($(GOOS),windows)
 	IS_EXE = ".exe"
 endif
 
-ifeq ($(GOARCH),amd64)
-	ARCHTAG ?= -amd64
-	ARCHTAG_NONE ?=
-else
-	ARCHTAG ?= -$(GOARCH)
-	ARCHTAG_NONE ?= -$(GOARCH)
-endif
-
-DEPLOYS=\
-	deploy/addons/addon-manager.yaml \
-	deploy/addons/dashboard/dashboard-dp.yaml \
-	deploy/addons/heapster/heapster-rc.yaml \
-	deploy/addons/heapster/influx-grafana-rc.yaml \
-	deploy/addons/ingress/ingress-dp.yaml \
-	deploy/addons/metrics-server/metrics-server-deployment.yaml \
-	deploy/addons/storage-provisioner/storage-provisioner.yaml
-
-%.yaml: %.template
-	sed "s|\-ARCHTAG_NONE|$(ARCHTAG_NONE)|g;s|\-ARCHTAG|$(ARCHTAG)|g" $< > $@
 
 out/minikube$(IS_EXE): out/minikube-$(GOOS)-$(GOARCH)$(IS_EXE)
 	cp $< $@
@@ -131,7 +112,7 @@ out/minikube.d: pkg/minikube/assets/assets.go
 
 -include out/minikube.d
 
-out/minikube-%: $(DEPLOYS) pkg/minikube/assets/assets.go
+out/minikube-%: pkg/minikube/assets/assets.go
 ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 	$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)
 else
diff --git a/deploy/addons/addon-manager.template b/deploy/addons/addon-manager.template
index 9e01dffc4..3b6dfa440 100644
--- a/deploy/addons/addon-manager.template
+++ b/deploy/addons/addon-manager.template
@@ -25,7 +25,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-addon-manager
-    image: {{default "k8s.gcr.io" .ImageRepository}}/kube-addon-manager-ARCHTAG_NONE:v9.0
+    image: {{default "k8s.gcr.io" .ImageRepository}}/kube-addon-manager-{{.Arch}}:v9.0
     env:
     - name: KUBECONFIG
       value: /var/lib/minikube/kubeconfig
diff --git a/deploy/addons/ingress/ingress-dp.template b/deploy/addons/ingress/ingress-dp.template
index 2cb248b19..d88c2ef58 100644
--- a/deploy/addons/ingress/ingress-dp.template
+++ b/deploy/addons/ingress/ingress-dp.template
@@ -39,7 +39,7 @@ spec:
         # Any image is permissible as long as:
         # 1. It serves a 404 page at /
         # 2. It serves 200 on a /healthz endpoint
-        image: {{default "gcr.io/google_containers" .ImageRepository}}/defaultbackend-ARCHTAG_NONE:1.4
+        image: {{default "gcr.io/google_containers" .ImageRepository}}/defaultbackend-{{.Arch}}:1.4
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -87,7 +87,7 @@ spec:
       serviceAccountName: nginx-ingress
       terminationGracePeriodSeconds: 60
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller-ARCHTAG_NONE:0.23.0
+      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller-{{.Arch}}:0.23.0
         name: nginx-ingress-controller
         imagePullPolicy: IfNotPresent
         readinessProbe:
diff --git a/deploy/addons/storage-provisioner/storage-provisioner.template b/deploy/addons/storage-provisioner/storage-provisioner.template
index b955826dd..3ccdbc4ba 100644
--- a/deploy/addons/storage-provisioner/storage-provisioner.template
+++ b/deploy/addons/storage-provisioner/storage-provisioner.template
@@ -51,7 +51,7 @@ spec:
   hostNetwork: true
   containers:
   - name: storage-provisioner
-    image: {{default "gcr.io/k8s-minikube" .ImageRepository}}/storage-provisioner-ARCHTAG_NONE:v1.8.1
+    image: {{default "gcr.io/k8s-minikube" .ImageRepository}}/storage-provisioner-{{.Arch}}:v1.8.1
     command: ["/storage-provisioner"]
     imagePullPolicy: IfNotPresent
     volumeMounts:
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index 8cd97e76a..005714e3c 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -21,6 +21,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strconv"
 
 	"github.com/pkg/errors"
@@ -382,8 +383,10 @@ func addMinikubeDirToAssets(basedir, vmpath string, assets *[]CopyableFile) erro
 func GenerateTemplateData(cfg config.KubernetesConfig) interface{} {
 	opts := struct {
 		ImageRepository string
+		Arch            string
 	}{
 		ImageRepository: cfg.ImageRepository,
+		Arch:            runtime.GOARCH,
 	}
 
 	return opts
-- 
GitLab