Merge pull request #128 from dlorenc/addons

Add the addon manager and dashboard to the iso.

deploy/addons/dashboard-svc.yaml

@@ -24,7 +24,6 @@ metadata:
 spec:
   ports:
   - port: 80
-    hostPort: 9090
     targetPort: 9090
   selector:
     app: kubernetes-dashboard

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

deploy/iso/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-amd64:v2
+    resources:
+      requests:
+        cpu: 5m
+        memory: 50Mi
+    volumeMounts:
+    - mountPath: /etc/kubernetes/
+      name: addons
+      readOnly: true
+  volumes:
+  - hostPath:
+      path: /etc/kubernetes/
+    name: addons

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