Merge pull request #136 from TheNewNormal/v0.9.6

v0.9.6

.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

README.md

@@ -29,7 +29,7 @@ How to install Kube-Solo
   - **macOS 10.10.3** Yosemite or later 
   - Mac 2010 or later for this to work.
   - **Note: [Corectl App](https://github.com/TheNewNormal/corectl.app) must be installed, which will serve as `corectld` server daemon control.**
-  - [iTerm2](https://www.iterm2.com/) is required, if not found the app it will install it by itself.
+  - [iTerm2](https://www.iterm2.com/) is required, if not found the app will install it by itself.
 
 
 ###Install:
@@ -43,15 +43,15 @@ How to install Kube-Solo
 - App will bootstrap `master+worker` Kubernetes cluster on the single VM
 - Mac user home folder is automaticly mounted via NFS (it has to work on Mac end of course) to `/Users/my_user`:`/Users/my_user` on each VM boot, check the [PV example](https://github.com/TheNewNormal/kube-solo-osx/blob/master/examples/pv/nfs-pv-mount-on-pod.md) how to use Persistent Volumes.
 - macOS `docker` client is installed to `~/kube-solo/bin` and preset in `OS shell` to be used from there, so you can build `docker` images on the VM and use with Kubernetes
-- After successful install you can control `kube-solo` VM via `ksolo` cli as well. Cli resides in `~/kube-solo/bin` and `~/bin`folders and has simple commands: `ksolo start|stop|status|ip|ssh`, just add `~/bin` to your pre-set path.
+- After successful install you can control `kube-solo` VM via `ksolo` cli as well. Cli resides in `~/kube-solo/bin` and `~/bin`folders and has simple commands: `ksolo start|stop|status|ip|ssh|shell`, just add `~/bin` to your pre-set path.
 
 **The install will do the following:**
 
 * All dependent files/folders will be put under `~/kube-solo` folder in the user's home folder e.g `/Users/someuser/kube-solo`. 
 * Will download latest CoreOS ISO image (if there is no such one) and run `corectl` to initialise VM 
 * When you first time do install or `Up` after destroying Kube-Solo setup, k8s binary files (with the version which was available when the App was built) get copied to VM, this allows to speed up Kubernetes setup.
 * It will install `docker, helmc, helm, deis and kubectl` clients to `~/kube-solo/bin/`
-* [Kubernetes Dashboard](http://kubernetes.io/docs/user-guide/ui/), [DNS](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dns) and [Kubedash](https://github.com/kubernetes/kubedash) will be instlled as add-ons
+* [Kubernetes Dashboard](http://kubernetes.io/docs/user-guide/ui/) and  [DNS](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dns) will be instlled as add-ons
 * Via assigned static IP (it will be shown in first boot and will survive VM's reboots) you can access any port on CoreOS VM
 * Persistent sparse disk (QCow2) `data.img` will be created and mounted to `/data` for these mount binds and other folders:
 
@@ -89,12 +89,11 @@ Path to `~/kube-solo/bin` where macOS clients and shell scripts are stored
 * `ksolo stop` will stop VM
 * `ksolo status`will show VM's status
 * `ksolo ip` will show VM's IP
-* `ksolo ssh` will open VM shell
-
+* `ksolo ssh` will ssh to VM
+* `ksolo shell` will open pre-set shell
 
 ###Other menu options:
 * [Kubernetes Dashboard](http://kubernetes.io/docs/user-guide/ui/) will show nice Kubernetes Dashboard, where you can check Nodes, Pods, Replication, Deployments, Service Controllers, deploy Apps and etc.
-* [Kubedash](https://github.com/kubernetes/kubedash) is a performance analytics UI for Kubernetes Clusters
 * `Check for App updates` will check for a new app version
 * `Updates/Update Kubernetes to the latest version` will update to latest version of Kubernetes.
 * `Updates/Change Kubernetes version` will download and install specified Kubernetes version from GitHub.
@@ -117,8 +116,8 @@ KubeDNS is running at http://192.168.64.3:8080/api/v1/proxy/namespaces/kube-syst
 kubernetes-dashboard is running at http://192.168.64.3:8080/api/v1/proxy/namespaces/kube-system/services/kubernetes-dashboard
 
 Cluster version:
-Client version: v1.3.2
-Server version: v1.3.2
+Client version: v1.4.0
+Server version: v1.4.0
 
 kubectl get nodes:
 NAME        STATUS    AGE

src/Kube-Solo/AppDelegate.m

@@ -326,22 +326,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_ipAddressURL] 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-Solo/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="15G31" 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">
@@ -684,12 +684,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="21F-qt-gCu"/>
-                    </connections>
-                </menuItem>
                 <menuItem isSeparatorItem="YES" id="JNE-kH-7PZ"/>
                 <menuItem title="Check for App updates" id="Suo-Zv-Vbz">
                     <modifierMask key="keyEquivalentModifierMask"/>

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

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.5</string>
+	<string>0.9.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>299</string>
+	<string>303</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/bin/install_deis

@@ -13,9 +13,6 @@ vm_ip=$(~/bin/corectl q -i k8solo-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/bin/ksolo

@@ -9,17 +9,10 @@ start() {
     "${app_path}"/up.command
 }
 
-
-stop() {
-    "${app_path}"/halt.command
-}
-
-
 status() {
     echo "$(~/bin/corectl q -a k8solo-01)"
 }
 
-
 ip() {
     echo "$(~/bin/corectl q -i k8solo-01)"
 }
@@ -28,8 +21,12 @@ ssh() {
     ~/bin/corectl ssh k8solo-01
 }
 
+shell() {
+    "${app_path}"/os_shell.command
+}
+
 usage() {
-    echo "Usage: ksolo start|stop|status|ip|ssh"
+    echo "Usage: ksolo start|stop|status|ip|ssh|shell"
 }
 
 
@@ -49,6 +46,9 @@ case "$1" in
         ssh)
                 ssh
                 ;;
+        shell)
+                shell
+                ;;
         *)
                 usage
                 ;;

src/functions.sh

@@ -352,7 +352,7 @@ rm -rf ~/kube-solo/tmp/*
 
 # downloading latest version of k8s for CoreOS
 echo "Downloading Kubernetes $K8S_VERSION"
-bins=( kubectl kubelet kube-proxy kube-apiserver kube-scheduler kube-controller-manager )
+bins=( kubelet kube-proxy kube-apiserver kube-scheduler kube-controller-manager )
 for b in "${bins[@]}"; do
     curl -k -L https://storage.googleapis.com/kubernetes-release/release/$K8S_VERSION/bin/linux/amd64/$b > ~/kube-solo/tmp/$b
 done
@@ -441,7 +441,7 @@ mv -f kubectl ~/kube-solo/kube
 chmod 755 ~/kube-solo/bin/kubectl
 #
 tar xvf kubernetes.tar.gz --strip=2 kubernetes/server/kubernetes-server-linux-amd64.tar.gz
-bins=( kubectl kubelet kube-proxy kube-apiserver kube-scheduler kube-controller-manager )
+bins=( kubelet kube-proxy kube-apiserver kube-scheduler kube-controller-manager )
 for b in "${bins[@]}"; do
     tar xvf kubernetes-server-linux-amd64.tar.gz -C ~/kube-solo/tmp --strip=3 kubernetes/server/bin/$b
 done
@@ -472,13 +472,19 @@ vm_ip=$(~/bin/corectl q -i k8solo-01)
 # check if file ~/kube-solo/kube/kube.tgz exists
 if [ ! -f ~/kube-solo/kube/kube.tgz ]
 then
-    # copy k8s files
-    cp -f "${res_folder}"/k8s/kubectl ~/kube-solo/kube
-    chmod +x ~/kube-solo/bin/kubectl
     # linux binaries tar file
     cp -f "${res_folder}"/k8s/kube.tgz ~/kube-solo/kube
 fi
 
+# check if file ~/kube-solo/bin/kubectl exists
+if [ ! -f ~/kube-solo/bin/kubectl ]
+then
+    # copy k8s files
+    cp -f "${res_folder}"/k8s/kubectl ~/kube-solo/bin
+    chmod +x ~/kube-solo/bin/kubectl
+
+fi
+
 # install k8s files on to VM
 echo "Installing Kubernetes files on to VM..."
 cd ~/kube-solo/kube
@@ -492,6 +498,16 @@ echo "Done..."
 
 
 function install_k8s_add_ons() {
+
+# check if file ~/kube-solo/bin/kubectl exists
+if [ ! -f ~/kube-solo/bin/kubectl ]
+then
+    # copy k8s files
+    cp -f "${res_folder}"/k8s/kubectl ~/kube-solo/bin
+    chmod +x ~/kube-solo/bin/kubectl
+
+fi
+
 echo " "
 echo "Creating kube-system namespace ..."
 ~/kube-solo/bin/kubectl create -f ~/kube-solo/kubernetes/kube-system-ns.yaml > /dev/null 2>&1
@@ -503,12 +519,8 @@ echo "Installing SkyDNS ..."
 #
 echo " "
 echo "Installing Kubernetes Dashboard ..."
-~/kube-solo/bin/kubectl create -f ~/kube-solo/kubernetes/dashboard-controller.yaml
 ~/kube-solo/bin/kubectl create -f ~/kube-solo/kubernetes/dashboard-service.yaml
-#
-echo " "
-echo "Installing Kubedash ..."
-~/kube-solo/bin/kubectl create -f ~/kube-solo/kubernetes/kubedash.yaml
+~/kube-solo/bin/kubectl create -f ~/kube-solo/kubernetes/dashboard-controller.yaml
 #
 echo " "
 echo "Installing Helm Tiller service ..."
@@ -522,18 +534,6 @@ rm -f ~/kube-solo/kubernetes/skydns-rc.yaml
 rm -f ~/kube-solo/kubernetes/skydns-svc.yaml
 rm -f ~/kube-solo/kubernetes/dashboard-controller.yaml
 rm -f ~/kube-solo/kubernetes/dashboard-service.yaml
-rm -f ~/kube-solo/kubernetes/kubedash.yaml
-}
-
-
-function install_k8s_add_ons_kubelet() {
-# get App's Resources folder
-res_folder=$(cat ~/kube-solo/.env/resouces_path)
-#
-echo " "
-echo "Installing add-ons: SkyDNS, Kubernetes Dashboard and Kubedash ..."
-~/bin/corectl scp "${res_folder}"/k8s/add-ons.tgz k8solo-01:/home/core/
-~/bin/corectl ssh k8solo-01 'sudo tar xzf /home/core/add-ons.tgz -C /data/kubernetes/manifests'
 }
 
 

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

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