Merge pull request #26 from TheNewNormal/v0.2.1

V0.2.1

README.md

@@ -24,6 +24,7 @@ How to install Kube-Cluster
  -----------
   - **OS X 10.10.3** Yosemite or later 
   - Mac 2010 or later for this to work.
+  - **Note:** For the fresh install it is recommended to restart your Mac if you have used VirtualBox based VM, as the VirtualBox sometimes messes up networking.
 
 
 ###Install:
@@ -40,8 +41,8 @@ That allows to share the same images between different `corectl` based Apps and
 * It will install `fleetctl, etcdctl and kubectl` to `~/kube-cluster/bin/`
 * Kubernetes services will be installed with fleet units which are placed in `~/kube-cluster/fleet`, this allows very easy updates to fleet units if needed.
 * [Fleet-UI](http://fleetui.com) via unit file will be installed to check running fleet units
-* [Kubernetes UI](http://kubernetes.io/v1.1/docs/user-guide/ui.html) will be instlled as an add-on
-* Also [DNS Add On](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dns) will be installed
+* [Kubernetes Dashboard](http://kubernetes.io/docs/user-guide/ui/) will be instlled as an add-on
+* Also [DNS addon](https://github.com/kubernetes/kubernetes/blob/release-1.2/cluster/addons/dns/README.md) will be installed
 * Via assigned static IPs (which will be shown on first boot and will survive VMs reboots) you can access any port on any CoreOS VM
 * Persistent disks `xxx-data.img` will be created and mounted to VMs `/data` for these mount binds:
 
@@ -75,8 +76,7 @@ Just start `Kube-Cluster` application and you will find a small icon with the Ku
 * `SSH to k8smaster01 and k8snode-01/02` menu options will open VMs shell
 * `node1/2 cAdvisor` will open cAdvisor URL in default browser
 * [Fleet-UI](http://fleetui.com) dashboard will show running fleet units and etc
-* [Kubernetes-UI](https://github.com/GoogleCloudPlatform/kubernetes/tree/master/www) (contributed by [Kismatic.io](http://kismatic.io/)) will show nice Kubernetes Dashboard, where you can check Nodes, Pods, Replication Controllers and etc.
-
+* [Kubernetes Dashboard](http://kubernetes.io/docs/user-guide/ui/) will show nice Kubernetes Dashboard, where you can check Nodes, Pods, Replication and Service Controllers, deploy Apps and etc.
 
 
 Example ouput of succesfull CoreOS + Kubernetes cluster install:
@@ -121,7 +121,7 @@ Usage
 
 You're now ready to use Kubernetes cluster.
 
-Some examples to start with [Kubernetes examples](https://github.com/kubernetes/kubernetes/tree/master/examples).
+Some examples to start with [Kubernetes examples](http://kubernetes.io/docs/samples/q).
 
 Other links
 -----------

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="9531" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -669,7 +669,7 @@
                         <action selector="fleetUI:" target="494" id="H66-cr-Sz1"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Kubernetes-UI" id="p5T-fc-xnA">
+                <menuItem title="Kubernetes Dashboard" id="p5T-fc-xnA">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
                         <action selector="KubernetesUI:" target="494" id="5Xc-5r-fwB"/>

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

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.0</string>
+	<string>0.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>41</string>
+	<string>45</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/first-init.command

@@ -79,7 +79,7 @@ deploy_fleet_units
 sleep 2
 
 # generate kubeconfig file
-echo Generate kubeconfig file ...
+echo Generating kubeconfig file ...
 "${res_folder}"/bin/gen_kubeconfig $master_vm_ip
 #
 

src/fleet/kube-apiserver.service

@@ -21,7 +21,7 @@ ExecStart=/opt/bin/kube-apiserver \
  --etcd_servers=http://127.0.0.1:2379 \
  --bind-address=0.0.0.0 \
  --logtostderr=true \
- --runtime_config=extensions/v1beta1=true,extensions/v1beta1/daemonsets=true
+ --runtime_config=extensions/v1beta1=true,extensions/v1beta1/deployment=true
 
 Restart=always
 RestartSec=10

src/functions.sh

@@ -489,15 +489,15 @@ echo "Installing SkyDNS ..."
 #
 echo " "
 echo "Installing Kubernetes UI ..."
-~/kube-cluster/bin/kubectl create -f ~/kube-cluster/kubernetes/kube-ui-rc.yaml
-~/kube-cluster/bin/kubectl create -f ~/kube-cluster/kubernetes/kube-ui-svc.yaml
+~/kube-cluster/bin/kubectl create -f ~/kube-cluster/kubernetes/dashboard-controller.yaml
+~/kube-cluster/bin/kubectl create -f ~/kube-cluster/kubernetes/dashboard-service.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/kube-ui-rc.yaml
-rm -f ~/kube-cluster/kubernetes/kube-ui-svc.yaml
+rm -f ~/kube-cluster/kubernetes/dashboard-controller.yaml
+rm -f ~/kube-cluster/kubernetes/dashboard-service.yaml
 echo " "
 }
 

src/k8s/kube-ui-rc.yaml → src/k8s/dashboard-controller.yaml

@@ -1,27 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-ui-v4
+  # Keep the name in sync with image version and
+  # gce/coreos/kube-manifests/addons/dashboard counterparts
+  name: kubernetes-dashboard-v1.0.0
   namespace: kube-system
   labels:
-    k8s-app: kube-ui
-    version: v4
+    k8s-app: kubernetes-dashboard
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
-    k8s-app: kube-ui
-    version: v4
+    k8s-app: kubernetes-dashboard
   template:
     metadata:
       labels:
-        k8s-app: kube-ui
-        version: v4
+        k8s-app: kubernetes-dashboard
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-      - name: kube-ui
-        image: gcr.io/google_containers/kube-ui:v4
+      - name: kubernetes-dashboard
+        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.0
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:
@@ -31,10 +30,10 @@ spec:
             cpu: 100m
             memory: 50Mi
         ports:
-        - containerPort: 8080
+        - containerPort: 9090
         livenessProbe:
           httpGet:
             path: /
-            port: 8080
+            port: 9090
           initialDelaySeconds: 30
-          timeoutSeconds: 5
+          timeoutSeconds: 30

src/k8s/kube-ui-svc.yaml → src/k8s/dashboard-service.yaml

@@ -1,15 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: kube-ui
+  name: kubernetes-dashboard
   namespace: kube-system
   labels:
-    k8s-app: kube-ui
+    k8s-app: kubernetes-dashboard
     kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "KubeUI"
 spec:
   selector:
-    k8s-app: kube-ui
+    k8s-app: kubernetes-dashboard
   ports:
   - port: 80
-    targetPort: 8080
+    targetPort: 9090

src/up.command

@@ -56,6 +56,13 @@ fi
 # start cluster VMs
 start_vms
 
+# generate kubeconfig file
+if [ ! -f $HOME/kube-cluster/kube/kubeconfig ]; then
+    echo Generating kubeconfig file ...
+    "${res_folder}"/bin/gen_kubeconfig $master_vm_ip
+    echo " "
+fi
+
 # Set the environment variables
 # set etcd endpoint
 export ETCDCTL_PEERS=http://$master_vm_ip:2379