From 0e7ff379d415622ce7bcfca4a6285ef52c30c92e Mon Sep 17 00:00:00 2001
From: Matt Rickard <mrick@google.com>
Date: Mon, 17 Oct 2016 12:09:03 -0700
Subject: [PATCH] Move addon-manager to deploy/addons, upgrade v5.1

---
 Makefile                         |  4 ++--
 deploy/addons/addon-manager.yaml | 39 ++++++++++++++++++++++++++++++++
 deploy/addons/dashboard-rc.yaml  |  2 --
 deploy/iso/addon-manager.yaml    | 23 -------------------
 pkg/minikube/assets/addons.go    |  2 +-
 5 files changed, 42 insertions(+), 28 deletions(-)
 create mode 100644 deploy/addons/addon-manager.yaml
 delete mode 100644 deploy/iso/addon-manager.yaml

diff --git a/Makefile b/Makefile
index 59639efad0..ea9038a732 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,8 @@ integration: out/minikube
 test: $(GOPATH)/src/$(ORG) pkg/minikube/assets/assets.go
 	./test.sh
 
-pkg/minikube/assets/assets.go: out/localkube $(GOPATH)/bin/go-bindata deploy/iso/addon-manager.yaml deploy/addons/dashboard-rc.yaml deploy/addons/dashboard-svc.yaml
-	$(GOPATH)/bin/go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets ./out/localkube deploy/iso/addon-manager.yaml deploy/addons/dashboard-rc.yaml deploy/addons/dashboard-svc.yaml
+pkg/minikube/assets/assets.go: out/localkube $(GOPATH)/bin/go-bindata deploy/addons/addon-manager.yaml deploy/addons/dashboard-rc.yaml deploy/addons/dashboard-svc.yaml
+	$(GOPATH)/bin/go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets ./out/localkube deploy/addons/addon-manager.yaml deploy/addons/dashboard-rc.yaml deploy/addons/dashboard-svc.yaml
 
 $(GOPATH)/bin/go-bindata: $(GOPATH)/src/$(ORG)
 	GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...
diff --git a/deploy/addons/addon-manager.yaml b/deploy/addons/addon-manager.yaml
new file mode 100644
index 0000000000..a3cc38e410
--- /dev/null
+++ b/deploy/addons/addon-manager.yaml
@@ -0,0 +1,39 @@
+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Pod
+metadata:
+  name: kube-addon-manager
+  namespace: kube-system
+  labels:
+    component: kube-addon-manager
+    version: v5.1
+spec:
+  hostNetwork: true
+  containers:
+  - name: kube-addon-manager
+    image: gcr.io/google-containers/kube-addon-manager:v5.1
+    resources:
+      requests:
+        cpu: 5m
+        memory: 50Mi
+    volumeMounts:
+    - mountPath: /etc/kubernetes/
+      name: addons
+      readOnly: true
+  volumes:
+  - hostPath:
+      path: /etc/kubernetes/
+    name: addons
diff --git a/deploy/addons/dashboard-rc.yaml b/deploy/addons/dashboard-rc.yaml
index 5c29a5f7ba..8acd077b34 100644
--- a/deploy/addons/dashboard-rc.yaml
+++ b/deploy/addons/dashboard-rc.yaml
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file should be kept in sync with cluster/addons/dashboard/dashboard-controller.yaml
 apiVersion: v1
 kind: ReplicationController
 metadata:
@@ -37,7 +36,6 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        # ARCH will be replaced with the architecture it's built for. Check out the Makefile for more details
         image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.0
         imagePullPolicy: IfNotPresent
         ports:
diff --git a/deploy/iso/addon-manager.yaml b/deploy/iso/addon-manager.yaml
deleted file mode 100644
index 0c1d2a19e4..0000000000
--- a/deploy/iso/addon-manager.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kube-addon-manager
-  namespace: kube-system
-  version: v1
-spec:
-  hostNetwork: true
-  containers:
-  - name: kube-addon-manager
-    image: gcr.io/google-containers/kube-addon-manager-amd64:v2
-    resources:
-      requests:
-        cpu: 5m
-        memory: 50Mi
-    volumeMounts:
-    - mountPath: /etc/kubernetes/
-      name: addons
-      readOnly: true
-  volumes:
-  - hostPath:
-      path: /etc/kubernetes/
-    name: addons
\ No newline at end of file
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index da72433712..7ff1d2847a 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -57,7 +57,7 @@ func (a *Addon) IsEnabled() (bool, error) {
 var Addons = map[string]*Addon{
 	"addon-manager": NewAddon([]*MemoryAsset{
 		NewMemoryAsset(
-			"deploy/iso/addon-manager.yaml",
+			"deploy/addons/addon-manager.yaml",
 			"/etc/kubernetes/manifests/",
 			"addon-manager.yaml",
 			"0640"),