Merge pull request #47 from TheNewNormal/v0.5.6

v0.5.6

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

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.5</string>
+	<string>0.5.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>167</string>
+	<string>169</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/k8s/dashboard-controller.yaml

@@ -3,10 +3,11 @@ kind: ReplicationController
 metadata:
   # Keep the name in sync with image version and
   # gce/coreos/kube-manifests/addons/dashboard counterparts
-  name: kubernetes-dashboard-v1.0.0
+  name: kubernetes-dashboard-v1.0.1
   namespace: kube-system
   labels:
     k8s-app: kubernetes-dashboard
+    version: v1.0.1
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
@@ -16,11 +17,12 @@ spec:
     metadata:
       labels:
         k8s-app: kubernetes-dashboard
+        version: v1.0.1
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.0
+        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.1
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

src/k8s/skydns-rc.yaml

@@ -1,32 +1,35 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v10
+  name: kube-dns-v11
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v10
+    version: v11
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: kube-dns
-    version: v10
+    version: v11
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v10
+        version: v11
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: etcd
-        image: gcr.io/google_containers/etcd:2.0.9
+        image: gcr.io/google_containers/etcd-amd64:2.2.1
         resources:
-          # keep request = limit to keep this container in guaranteed class
+          # TODO: Set memory limits when we've profiled the container for large
+          # clusters, then set request = limit to keep this container in
+          # guaranteed class. Currently, this container falls into the
+          # "burstable" category so the kubelet doesn't backoff from restarting it.
           limits:
             cpu: 100m
-            memory: 50Mi
+            memory: 500Mi
           requests:
             cpu: 100m
             memory: 50Mi
@@ -44,26 +47,51 @@ spec:
         - name: etcd-storage
           mountPath: /var/etcd/data
       - name: kube2sky
-        image: gcr.io/google_containers/kube2sky:1.12
+        image: gcr.io/google_containers/kube2sky:1.14
         resources:
-          # keep request = limit to keep this container in guaranteed class
+          # TODO: Set memory limits when we've profiled the container for large
+          # clusters, then set request = limit to keep this container in
+          # guaranteed class. Currently, this container falls into the
+          # "burstable" category so the kubelet doesn't backoff from restarting it.
           limits:
             cpu: 100m
-            memory: 50Mi
+            # Kube2sky watches all pods.
+            memory: 200Mi
           requests:
             cpu: 100m
             memory: 50Mi
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 60
+          timeoutSeconds: 5
+          successThreshold: 1
+          failureThreshold: 5
+        readinessProbe:
+          httpGet:
+            path: /readiness
+            port: 8081
+            scheme: HTTP
+          # we poll on pod startup for the Kubernetes master service and
+          # only setup the /readiness HTTP server once that's available.
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
         args:
         # command = "/kube2sky"
-        - -kube_master_url=http://_MASTER_IP_:8080
-        - -domain=cluster.local
+        - --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
+          # TODO: Set memory limits when we've profiled the container for large
+          # clusters, then set request = limit to keep this container in
+          # guaranteed class. Currently, this container falls into the
+          # "burstable" category so the kubelet doesn't backoff from restarting it.
           limits:
             cpu: 100m
-            memory: 50Mi
+            memory: 200Mi
           requests:
             cpu: 100m
             memory: 50Mi
@@ -80,20 +108,6 @@ spec:
         - containerPort: 53
           name: dns-tcp
           protocol: TCP
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 1
-          timeoutSeconds: 5
       - name: healthz
         image: gcr.io/google_containers/exechealthz:1.0
         resources:

src/kube-solo-install.command

@@ -35,9 +35,11 @@
     # linux binaries
     cp "$1"/k8s/kube.tgz ~/kube-solo/kube
 
+    # copy fleetctl
+    cp -f "$1"/files/fleetctl ~/kube-solo/bin
+
     # copy fleet units
     cp -R "$1"/fleet/ ~/kube-solo/fleet
-    #
 
     # check if iTerm.app exists
     App="/Applications/iTerm.app"