replacing sed with go template

kubernetes · May 6, 2019 · 69a1148 · 69a1148
1 parent fe3f7a0
commit 69a1148
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -100,13 +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 \
@@ -117,9 +110,6 @@ DEPLOYS=\
 	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 $< $@
 

diff --git 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-{{default "ARCHTAG_NONE" .ArchTag}}: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
@@ -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-{{default "ARCHTAG_NONE" .ArchTag}}: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-{{default "ARCHTAG_NONE" .ArchTag}}: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
@@ -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-{{default "ARCHTAG_NONE" .ArchTag}}:v1.8.1
     command: ["/storage-provisioner"]
     imagePullPolicy: IfNotPresent
     volumeMounts:

diff --git 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
+		ArchTag         string
 	}{
 		ImageRepository: cfg.ImageRepository,
+		ArchTag:         runtime.GOARCH,
 	}
 
 	return opts