v1.0.0 (#159)

.gitignore

@@ -18,3 +18,5 @@ DerivedData
 *.xcuserstate
 UserInterfaceState.xcuserstate
 .DS_Store
+kube.tgz
+kubectl

src/Kube-Solo/Kube-Solo-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.9</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>311</string>
+	<string>315</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/cloud-init/user-data

@@ -134,7 +134,7 @@ coreos:
         ConditionPathExists=/opt/sbin/make-certs.sh
         Requires=network-online.target persistent-data-checks.service etcd2.service
         After=network-online.target persistent-data-checks.service etcd2.service
-        # ConditionPathExists=!/data/kubernetes/ca.crt
+        ConditionPathExists=!/data/kubernetes/ca.crt
         [Service]
         EnvironmentFile=/etc/environment
         ExecStartPre=-/usr/sbin/groupadd -r kube-cert

src/functions.sh

@@ -135,15 +135,15 @@ function create_data_disk() {
 cd ~/kube-solo/
 echo "  "
 echo "Please type Data disk size in GBs followed by [ENTER]:"
-echo -n "[default is 30]: "
+echo -n "[default is 40]: "
 read disk_size
 if [ -z "$disk_size" ]
 then
     echo " "
-    echo "Creating 30GB sparse disk (QCow2)..."
-    ~/bin/qcow-tool create --size=30GiB data.img
+    echo "Creating 40GB sparse disk (QCow2)..."
+    ~/bin/qcow-tool create --size=40GiB data.img
     echo "-"
-    echo "Created 30GB Data disk"
+    echo "Created 40GB Data disk"
     # create file 'unfinished_setup' so on next boot fresh install gets triggered again !!!
     touch ~/kube-solo/logs/unfinished_setup > /dev/null 2>&1
 else
@@ -223,13 +223,15 @@ if [ ! -f ~/kube-solo/bin/docker ]; then
     cd ~/kube-solo/bin
     echo " "
     echo "Downloading docker $DOCKER_VERSION client for macOS"
-    curl -o ~/kube-solo/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
+    curl -o ~/kube-solo/bin/docker.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
     # tarball with directory docker containing docker executable
-    tar -xzf docker-$DOCKER_VERSION.tgz
+    tar -xzf docker.tgz
     mv docker dockerdir
     mv dockerdir/docker .
-    rm docker-$DOCKER_VERSION.tgz
-    rmdir dockerdir
+    rm docker.tgz
+    rmdir -p dockerdir
+    # Make it executable
+    chmod +x ~/kube-solo/bin/docker
 else
     # docker client version
     INSTALLED_VERSION=$(~/kube-solo/bin/docker version | grep 'Version:' | awk '{print $2}' | tr -d '\r' | head -1 )
@@ -239,13 +241,15 @@ else
         cd ~/kube-solo/bin
         echo " "
         echo "Downloading docker $DOCKER_VERSION client for macOS"
-        curl -o ~/kube-solo/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
+        curl -o ~/kube-solo/bin/docker.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
         # tarball with directory docker containing docker executable
-        tar -xzf docker-$DOCKER_VERSION.tgz
+        tar -xzf docker.tgz
         mv docker dockerdir
         mv dockerdir/docker .
-        rm docker-$DOCKER_VERSION.tgz
-        rmdir dockerdir
+        rm docker.tgz
+        rmdir -p dockerdir
+        # Make it executable
+        chmod +x ~/kube-solo/bin/docker
     else
         echo " "
         echo "macOS docker client is up to date with VM's version ..."

src/k8s/add-ons/dashboard-controller.yaml

@@ -1,30 +1,27 @@
 # This file should be kept in sync with cluster/gce/coreos/kube-manifests/addons/dashboard/dashboard-controller.yaml
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: kubernetes-dashboard-v1.4.0
+  name: kubernetes-dashboard
   namespace: kube-system
   labels:
     k8s-app: kubernetes-dashboard
-    version: v1.4.0
     kubernetes.io/cluster-service: "true"
 spec:
-  replicas: 1
   selector:
-    k8s-app: kubernetes-dashboard
+    matchLabels:
+      k8s-app: kubernetes-dashboard
   template:
     metadata:
       labels:
         k8s-app: kubernetes-dashboard
-        version: v1.4.0
-        kubernetes.io/cluster-service: "true"
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.0
+        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.2
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits: