Merge pull request #101 from TheNewNormal/v0.5.1

v0.5.1

.gitattributes

@@ -0,0 +1,2 @@
+src/k8s/kube.tgz filter=lfs diff=lfs merge=lfs -text
+src/k8s/kubectl filter=lfs diff=lfs merge=lfs -text

src/Kube-Cluster/AppDelegate.m

@@ -410,24 +410,6 @@ - (IBAction)KubernetesUI:(id)sender {
 }
 
 
-- (IBAction)Kubedash:(id)sender {
-    VMStatus vmStatus = [self.vmManager checkVMStatus];
-
-    switch (vmStatus) {
-        case VMStatusDown:
-            [self notifyUserWithText:NSLocalizedString(@"VMStateOff", nil)];
-            break;
-
-        case VMStatusUp: {
-            NSString *vmIP = [NSString stringWithContentsOfURL:[NSURL ks_masterIpAddressURL] encoding:NSUTF8StringEncoding error:nil];
-            NSString *url = [NSString stringWithFormat:@"http://%@:8080/api/v1/proxy/namespaces/kube-system/services/kubedash", vmIP];
-            [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
-            break;
-        }
-    }
-}
-
-
 - (IBAction)quit:(id)sender {
     VMStatus vmStatus = [self.vmManager checkVMStatus];
 

src/Kube-Cluster/Base.lproj/MainMenu.xib

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2327e" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -668,12 +668,6 @@
                         <action selector="KubernetesUI:" target="494" id="5Xc-5r-fwB"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Kubedash" id="bXS-8Q-f6a">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <connections>
-                        <action selector="Kubedash:" target="494" id="TJP-yC-M7A"/>
-                    </connections>
-                </menuItem>
                 <menuItem isSeparatorItem="YES" id="JNE-kH-7PZ"/>
                 <menuItem title="Check for App updates" id="mVR-pT-vO7">
                     <modifierMask key="keyEquivalentModifierMask"/>

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

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.0</string>
+	<string>0.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>197</string>
+	<string>201</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/bin/install_deis

@@ -12,9 +12,6 @@ node1_vm_ip=$(~/bin/corectl q -i k8snode-01)
 
 #
 echo " "
-echo "If you have installed previous versions of Deis Workflow PaaS, please uninstall it first"
-echo "with '$ helmc uninstall workflow-VERSION -n deis' ..."
-echo " "
 echo "If you want to upgrade already installed version, check out how to do upgrade at https://deis.com/docs/workflow/managing-workflow/upgrading-workflow/"
 echo " "
 pause 'Press [Enter] key to continue...'

src/cloud-init/user-data.node

@@ -66,6 +66,7 @@ coreos:
         ExecStart=/bin/sh -c '[[ -d /data/kubernetes/manifests ]] || mkdir -p /data/kubernetes/manifests'
         ExecStart=/bin/sh -c '[[ -d /data/kubelet ]] || mkdir -p /data/kubelet'
         ExecStart=/bin/sh -c 'sudo ln -s /data/kubelet /var/lib/kubelet'
+        ExecStart=/bin/sh -c 'sudo mkdir -p /opt/bin/ && sudo ln -s /data/opt/bin/socat /opt/bin/socat'
     - name: var-lib-docker.mount
       command: start
       content: |

src/functions.sh

@@ -591,17 +591,13 @@ echo "Installing Kubernetes UI ..."
 ~/kube-cluster/bin/kubectl create -f ~/kube-cluster/kubernetes/dashboard-controller.yaml
 ~/kube-cluster/bin/kubectl create -f ~/kube-cluster/kubernetes/dashboard-service.yaml
 #
-echo " "
-echo "Installing Kubedash ..."
-~/kube-cluster/bin/kubectl create -f ~/kube-cluster/kubernetes/kubedash.yaml
 sleep 1
 # clean up kubernetes folder
 rm -f ~/kube-cluster/kubernetes/kube-system-ns.yaml
 rm -f ~/kube-cluster/kubernetes/skydns-rc.yaml
 rm -f ~/kube-cluster/kubernetes/skydns-svc.yaml
 rm -f ~/kube-cluster/kubernetes/dashboard-controller.yaml
 rm -f ~/kube-cluster/kubernetes/dashboard-service.yaml
-rm -f ~/kube-cluster/kubernetes/kubedash.yaml
 echo " "
 }
 

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

@@ -2,11 +2,11 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kubernetes-dashboard-v1.1.0
+  name: kubernetes-dashboard-v1.4.0
   namespace: kube-system
   labels:
     k8s-app: kubernetes-dashboard
-    version: v1.1.0
+    version: v1.4.0
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
@@ -16,12 +16,15 @@ spec:
     metadata:
       labels:
         k8s-app: kubernetes-dashboard
-        version: v1.1.0
+        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.1.0
+        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.0
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

src/k8s/add-ons/skydns-rc.yaml

@@ -1,41 +1,42 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v17
+  name: kube-dns-v19
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v17
+    version: v19
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: kube-dns
-    version: v17
+    version: v19
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v17
-        kubernetes.io/cluster-service: "true"
+        version: v19
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
+        scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/kubedns-amd64:1.5
+        image: gcr.io/google_containers/kubedns-amd64:1.7
         resources:
           # 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: 200Mi
+            memory: 170Mi
           requests:
             cpu: 100m
-            memory: 100Mi
+            memory: 70Mi
         livenessProbe:
           httpGet:
-            path: /healthz
+            path: /healthz-kubedns
             port: 8080
             scheme: HTTP
           initialDelaySeconds: 60
@@ -49,7 +50,7 @@ spec:
             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
+          initialDelaySeconds: 3
           timeoutSeconds: 5
         args:
         # command = "/kube-dns"
@@ -64,10 +65,20 @@ spec:
           protocol: TCP
       - name: dnsmasq
         image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3
+        livenessProbe:
+          httpGet:
+            path: /healthz-dnsmasq
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 60
+          timeoutSeconds: 5
+          successThreshold: 1
+          failureThreshold: 5
         args:
         - --cache-size=1000
         - --no-resolv
         - --server=127.0.0.1#10053
+        - --log-facility=-
         ports:
         - containerPort: 53
           name: dns
@@ -76,19 +87,24 @@ spec:
           name: dns-tcp
           protocol: TCP
       - name: healthz
-        image: gcr.io/google_containers/exechealthz-amd64:1.0
+        image: gcr.io/google_containers/exechealthz-amd64:1.2
         resources:
-          # keep request = limit to keep this container in guaranteed class
           limits:
-            cpu: 10m
-            memory: 20Mi
+            memory: 50Mi
           requests:
             cpu: 10m
-            memory: 20Mi
+            # Note that this container shouldn't really need 50Mi of memory. The
+            # limits are set higher than expected pending investigation on #29688.
+            # The extra memory was stolen from the kubedns container to keep the
+            # net memory requested by the pod constant.
+            memory: 50Mi
         args:
-        - -cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null
-        - -port=8080
-        - -quiet
+        - --cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null
+        - --url=/healthz-dnsmasq
+        - --cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1:10053 >/dev/null
+        - --url=/healthz-kubedns
+        - --port=8080
+        - --quiet
         ports:
         - containerPort: 8080
           protocol: TCP

src/k8s/download_dashboard.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+#  download_dashboard.command
+#  Kube-Solo for macOS
+#
+#  Created by Rimantas on 03/06/2015.
+#  Copyright (c) 2014 Rimantas Mocevicius. All rights reserved.
+
+function pause(){
+read -p "$*"
+}
+
+rm -f add-ons/dashboard-controller.yaml
+rm -f add-ons/dashboard-service.yaml
+
+#
+curl -L https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/addons/dashboard/dashboard-controller.yaml > add-ons/dashboard-controller.yaml
+curl -L https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/addons/dashboard/dashboard-service.yaml > add-ons/dashboard-service.yaml
+
+#
+echo "Download has finished !!!"
+pause 'Press [Enter] key to continue...'

src/k8s/download_k8s.command

@@ -33,6 +33,9 @@ for b in "${bins[@]}"; do
     curl -L https://storage.googleapis.com/kubernetes-release/release/$K8S_VERSION/bin/linux/amd64/$b > kube/$b
 done
 
+# copy socat file
+cp socat/socat kube
+#
 chmod a+x kube/*
 #
 curl -L https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz > kube/easy-rsa.tar.gz