From 7fb536ec38ae70a979942c84747432a05b30f9a7 Mon Sep 17 00:00:00 2001
From: Dan Lorenc <lorenc.d@gmail.com>
Date: Sat, 28 May 2016 11:05:12 -0700
Subject: [PATCH 1/2] Add the addon manager and dashboard to the iso.

---
 deploy/addons/addon-manager.yaml | 23 +++++++++++++++++++++++
 deploy/iso/Dockerfile            |  5 +++++
 deploy/iso/build.sh              |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 deploy/addons/addon-manager.yaml

diff --git a/deploy/addons/addon-manager.yaml b/deploy/addons/addon-manager.yaml
new file mode 100644
index 000000000000..2d81b5802f9c
--- /dev/null
+++ b/deploy/addons/addon-manager.yaml
@@ -0,0 +1,23 @@
+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:v1
+    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/deploy/iso/Dockerfile b/deploy/iso/Dockerfile
index e93716c161b1..00c566f33b2d 100644
--- a/deploy/iso/Dockerfile
+++ b/deploy/iso/Dockerfile
@@ -25,6 +25,11 @@ ADD nsenter $ROOTFS/usr/bin/
 ADD socat $ROOTFS/usr/bin
 ADD ethtool $ROOTFS/usr/bin
 
+# Add addons
+ADD addon-manager.yaml $ROOTFS/etc/kubernetes/manifests/
+ADD dashboard-rc.yaml $ROOTFS/etc/kubernetes/addons/
+ADD dashboard-svc.yaml $ROOTFS/etc/kubernetes/addons/
+
 # Get a specific version of Docker. This will overwrite the binary installed
 # in the base image.
 # The --strip-components=3 flag will have to change as we switch docker versions
diff --git a/deploy/iso/build.sh b/deploy/iso/build.sh
index 88c219a99bcf..d0b9a0190444 100755
--- a/deploy/iso/build.sh
+++ b/deploy/iso/build.sh
@@ -20,6 +20,8 @@ ISO=minikube.iso
 tmpdir=$(mktemp -d)
 echo "Building in $tmpdir."
 cp -r . $tmpdir/
+# Copy in the addons
+cp ../addons/* $tmpdir/
 
 pushd $tmpdir
 

From 4cd9e5610df7574189fe2403d48a4aa308caf209 Mon Sep 17 00:00:00 2001
From: Dan Lorenc <lorenc.d@gmail.com>
Date: Sat, 28 May 2016 11:39:29 -0700
Subject: [PATCH 2/2] Fix hostPort bug in dashboard-svc.yaml. hostPort is
 invalid in a service.

---
 deploy/addons/dashboard-svc.yaml                   | 1 -
 deploy/{ => docker}/static-pods/addon-manager.yaml | 0
 deploy/{addons => iso}/addon-manager.yaml          | 2 +-
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename deploy/{ => docker}/static-pods/addon-manager.yaml (100%)
 rename deploy/{addons => iso}/addon-manager.yaml (86%)

diff --git a/deploy/addons/dashboard-svc.yaml b/deploy/addons/dashboard-svc.yaml
index 756bd781fff9..7cf55a6f0093 100644
--- a/deploy/addons/dashboard-svc.yaml
+++ b/deploy/addons/dashboard-svc.yaml
@@ -24,7 +24,6 @@ metadata:
 spec:
   ports:
   - port: 80
-    hostPort: 9090
     targetPort: 9090
   selector:
     app: kubernetes-dashboard
diff --git a/deploy/static-pods/addon-manager.yaml b/deploy/docker/static-pods/addon-manager.yaml
similarity index 100%
rename from deploy/static-pods/addon-manager.yaml
rename to deploy/docker/static-pods/addon-manager.yaml
diff --git a/deploy/addons/addon-manager.yaml b/deploy/iso/addon-manager.yaml
similarity index 86%
rename from deploy/addons/addon-manager.yaml
rename to deploy/iso/addon-manager.yaml
index 2d81b5802f9c..0c1d2a19e4a1 100644
--- a/deploy/addons/addon-manager.yaml
+++ b/deploy/iso/addon-manager.yaml
@@ -8,7 +8,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-addon-manager
-    image: gcr.io/google-containers/kube-addon-manager:v1
+    image: gcr.io/google-containers/kube-addon-manager-amd64:v2
     resources:
       requests:
         cpu: 5m