Merge pull request #19 from TheNewNormal/v0.4.6

V0.4.6
TheNewNormal · Jan 18, 2016 · d838764 · d838764
2 parents b0e4a20 + 2b7df13
commit d838764
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 19 deletions.
diff --git a/src/Kube-Solo/Kube-Solo-Info.plist b/src/Kube-Solo/Kube-Solo-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.5</string>
+	<string>0.4.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>145</string>
+	<string>147</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/bin/corectl b/src/bin/corectl
diff --git a/src/bin/install_deis b/src/bin/install_deis
@@ -38,7 +38,7 @@ echo "To learn more about deis client, execute:"
 echo "deis -h"
 echo " "
 #
-echo "Waiting for Deis PaaS to be ready, it could take a while (5-10 min) ... "
+echo "Waiting for Deis PaaS to be ready... but first, coffee! "
 spin='-\|/'
 i=1
 until kubectl --namespace=deis get po | grep [d]eis-builder- | grep "Running"  >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done

diff --git a/src/k8s/kube-ui-rc.yaml b/src/k8s/kube-ui-rc.yaml
@@ -1,31 +1,35 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-ui-v3
+  name: kube-ui-v4
   namespace: kube-system
   labels:
     k8s-app: kube-ui
-    version: v3
+    version: v4
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: kube-ui
-    version: v3
+    version: v4
   template:
     metadata:
       labels:
         k8s-app: kube-ui
-        version: v3
+        version: v4
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: kube-ui
-        image: gcr.io/google_containers/kube-ui:v3
+        image: gcr.io/google_containers/kube-ui:v4
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
             memory: 50Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
         ports:
         - containerPort: 8080
         livenessProbe:

diff --git a/src/k8s/kube.tgz b/src/k8s/kube.tgz
diff --git a/src/k8s/kubectl b/src/k8s/kubectl
diff --git a/src/k8s/skydns-rc.yaml b/src/k8s/skydns-rc.yaml
@@ -1,31 +1,35 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v9
+  name: kube-dns-v10
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v9
+    version: v10
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: kube-dns
-    version: v9
+    version: v10
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v9
+        version: v10
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: etcd
         image: gcr.io/google_containers/etcd:2.0.9
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
             memory: 50Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
         command:
         - /usr/local/bin/etcd
         - -data-dir
@@ -40,24 +44,32 @@ spec:
         - name: etcd-storage
           mountPath: /var/etcd/data
       - name: kube2sky
-        image: gcr.io/google_containers/kube2sky:1.11
+        image: gcr.io/google_containers/kube2sky:1.12
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
             memory: 50Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
         args:
         # command = "/kube2sky"
         - -kube_master_url=http://_MASTER_IP_:8080
         - -domain=cluster.local
       - name: skydns
         image: gcr.io/google_containers/skydns:2015-10-13-8c72f8c
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
             memory: 50Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
         args:
         # command = "/skydns"
-        - -machines=http://127.0.0.1:2379
+        - -machines=http://127.0.0.1:4001
         - -addr=0.0.0.0:53
         - -ns-rotate=false
         - -domain=cluster.local
@@ -85,9 +97,13 @@ spec:
       - name: healthz
         image: gcr.io/google_containers/exechealthz:1.0
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 10m
             memory: 20Mi
+          requests:
+            cpu: 10m
+            memory: 20Mi
         args:
         - -cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null
         - -port=8080

diff --git a/src/restore_update_fleet_units.command b/src/restore_update_fleet_units.command
@@ -31,11 +31,11 @@ export FLEETCTL_ENDPOINT=http://$vm_ip:2379
 export FLEETCTL_DRIVER=etcd
 export FLEETCTL_STRICT_HOST_KEY_CHECKING=false
 cd ~/kube-solo/fleet
-~/kube-solo/bin/fleetctl stop kube-apiserver.service
-~/kube-solo/bin/fleetctl stop kube-controller-manager.service
-~/kube-solo/bin/fleetctl stop kube-scheduler.service
-~/kube-solo/bin/fleetctl stop kube-kubelet.service
-~/kube-solo/bin/fleetctl stop kube-proxy.service
+~/kube-solo/bin/fleetctl destroy kube-apiserver.service
+~/kube-solo/bin/fleetctl destroy kube-controller-manager.service
+~/kube-solo/bin/fleetctl destroy kube-scheduler.service
+~/kube-solo/bin/fleetctl destroy kube-kubelet.service
+~/kube-solo/bin/fleetctl destroy kube-proxy.service
 echo " "
 sleep 5
 ~/kube-solo/bin/fleetctl start kube-apiserver.service