Merge pull request #11 from TheNewNormal/v0.1.7

v0.1.7

src/Kube-Cluster/Kube-Cluster-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.6</string>
+	<string>0.1.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>33</string>
+	<string>35</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/cloud-init/user-data.node1

@@ -63,6 +63,7 @@ coreos:
         ExecStart=/bin/sh -c '[[ -d /data/var/lib/etcd2 ]] || mkdir -p /data/var/lib/etcd2 && /usr/bin/chown etcd:etcd /data/var/lib/etcd2'
         ExecStart=/bin/sh -c '[[ -d /data/opt/bin ]] || mkdir -p /data/opt/bin'
         ExecStart=/bin/sh -c '[[ -d /data/kubernetes ]] || mkdir -p /data/kubernetes'
+        ExecStart=/bin/sh -c '[[ -d /data/mnt ]] || mkdir -p /data/mnt'
     - name: var-lib-etcd2.mount
       command: start
       content: |
@@ -115,6 +116,19 @@ coreos:
         Where=/opt/bin
         Type=none
         Options=bind
+    - name: mnt.mount
+      command: start
+      content: |
+        [Unit]
+        Description=Binds /data/mnt to /mnt
+        Requires=persistent-data-checks.service
+        After=persistent-data-checks.service
+        Before=docker.service rkt-metadata.socket
+        [Mount]
+        What=/data/mnt
+        Where=/mnt
+        Type=none
+        Options=bind
     - name: etcd2.service
       command: start
     - name: fleet.service

src/cloud-init/user-data.node2

@@ -63,6 +63,7 @@ coreos:
         ExecStart=/bin/sh -c '[[ -d /data/var/lib/etcd2 ]] || mkdir -p /data/var/lib/etcd2 && /usr/bin/chown etcd:etcd /data/var/lib/etcd2'
         ExecStart=/bin/sh -c '[[ -d /data/opt/bin ]] || mkdir -p /data/opt/bin'
         ExecStart=/bin/sh -c '[[ -d /data/kubernetes ]] || mkdir -p /data/kubernetes'
+        ExecStart=/bin/sh -c '[[ -d /data/mnt ]] || mkdir -p /data/mnt'
     - name: var-lib-etcd2.mount
       command: start
       content: |
@@ -115,6 +116,19 @@ coreos:
         Where=/opt/bin
         Type=none
         Options=bind
+    - name: mnt.mount
+      command: start
+      content: |
+        [Unit]
+        Description=Binds /data/mnt to /mnt
+        Requires=persistent-data-checks.service
+        After=persistent-data-checks.service
+        Before=docker.service rkt-metadata.socket
+        [Mount]
+        What=/data/mnt
+        Where=/mnt
+        Type=none
+        Options=bind
     - name: etcd2.service
       command: start
     - name: fleet.service

src/functions.sh

@@ -91,37 +91,37 @@ export PATH=${HOME}/kube-cluster/bin:$PATH
 # create persistent disks
 cd ~/kube-cluster/
 echo "  "
-echo "Creating 1.5GB Data disk for Master ..."
-mkfile 1.5g master-data.img
-echo "-"
-echo "Created 1.5GB Data disk for Master"
+echo "Creating 1GB Data disk for Master ..."
+##mkfile 1g master-data.img
+~/kube-cluster/bin/pv -s 1g -S < /dev/zero > master-data.img
+echo "Created 1GB Data disk for Master"
 echo " "
 
 echo "Please type Nodes Data disk size in GBs followed by [ENTER]:"
-echo -n "[default is 5]: "
+echo -n "[default is 10]: "
 read disk_size
 if [ -z "$disk_size" ]
 then
     echo " "
-    echo "Creating 5GB Data disk for Node1..."
-    mkfile 5g node-01-data.img
-    echo "-"
-    echo "Created 5GB Data disk for Node1"
+    echo "Creating 10GB Data disk for Node1..."
+##    mkfile 10g node-01-data.img
+    ~/kube-cluster/bin/pv -s 10g -S < /dev/zero > node-01-data.img
+    echo "Created 10GB Data disk for Node1"
     echo " "
-    echo "Creating 5GB Data disk for Node2..."
-    mkfile 5g node-02-data.img
-    echo "-"
-    echo "Created 5GB Data disk for Node2"
+    echo "Creating 10GB Data disk for Node2..."
+##    mkfile 10g node-02-data.img
+    ~/kube-cluster/bin/pv -s 10g -S < /dev/zero > node-02-data.img
+    echo "Created 10GB Data disk for Node2"
 else
     echo " "
     echo "Creating "$disk_size"GB Data disk for Node1 (it could take a while for big disks)..."
-    mkfile "$disk_size"g node-01-data.img
-    echo "-"
+##    mkfile "$disk_size"g node-01-data.img
+    ~/kube-cluster/bin/pv -s "$disk_size"g -S < /dev/zero > node-01-data.img
     echo "Created "$disk_size"GB Data disk for Node1"
     echo " "
     echo "Creating "$disk_size"GB Data disk for Node2 (it could take a while for big disks)..."
-    mkfile "$disk_size"g node-02-data.img
-    echo "-"
+##    mkfile "$disk_size"g node-02-data.img
+    ~/kube-cluster/bin/pv -s "$disk_size"g -S < /dev/zero > node-02-data.img
     echo "Created "$disk_size"GB Data disk for Node2"
 fi