From bf836418cd3dadf9699b3eb9c0ab4304a5e21e87 Mon Sep 17 00:00:00 2001 From: Rimas Mocevicius Date: Mon, 14 Nov 2016 10:38:03 +0000 Subject: [PATCH] v1.0.0 (#159) --- .gitignore | 2 ++ src/Kube-Solo/Kube-Solo-Info.plist | 4 ++-- src/cloud-init/user-data | 2 +- src/functions.sh | 28 +++++++++++++---------- src/k8s/add-ons/dashboard-controller.yaml | 15 +++++------- src/k8s/kube.tgz | 4 ++-- src/k8s/kubectl | 4 ++-- 7 files changed, 31 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index acf7a3b..0a1d181 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ DerivedData *.xcuserstate UserInterfaceState.xcuserstate .DS_Store +kube.tgz +kubectl diff --git a/src/Kube-Solo/Kube-Solo-Info.plist b/src/Kube-Solo/Kube-Solo-Info.plist index be63e49..647801b 100644 --- a/src/Kube-Solo/Kube-Solo-Info.plist +++ b/src/Kube-Solo/Kube-Solo-Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.9 + 1.0.0 CFBundleSignature ???? CFBundleVersion - 311 + 315 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/src/cloud-init/user-data b/src/cloud-init/user-data index 4b8d98b..08c463c 100644 --- a/src/cloud-init/user-data +++ b/src/cloud-init/user-data @@ -134,7 +134,7 @@ coreos: ConditionPathExists=/opt/sbin/make-certs.sh Requires=network-online.target persistent-data-checks.service etcd2.service After=network-online.target persistent-data-checks.service etcd2.service - # ConditionPathExists=!/data/kubernetes/ca.crt + ConditionPathExists=!/data/kubernetes/ca.crt [Service] EnvironmentFile=/etc/environment ExecStartPre=-/usr/sbin/groupadd -r kube-cert diff --git a/src/functions.sh b/src/functions.sh index 3e2a573..8fcce64 100755 --- a/src/functions.sh +++ b/src/functions.sh @@ -135,15 +135,15 @@ function create_data_disk() { cd ~/kube-solo/ echo " " echo "Please type Data disk size in GBs followed by [ENTER]:" -echo -n "[default is 30]: " +echo -n "[default is 40]: " read disk_size if [ -z "$disk_size" ] then echo " " - echo "Creating 30GB sparse disk (QCow2)..." - ~/bin/qcow-tool create --size=30GiB data.img + echo "Creating 40GB sparse disk (QCow2)..." + ~/bin/qcow-tool create --size=40GiB data.img echo "-" - echo "Created 30GB Data disk" + echo "Created 40GB Data disk" # create file 'unfinished_setup' so on next boot fresh install gets triggered again !!! touch ~/kube-solo/logs/unfinished_setup > /dev/null 2>&1 else @@ -223,13 +223,15 @@ if [ ! -f ~/kube-solo/bin/docker ]; then cd ~/kube-solo/bin echo " " echo "Downloading docker $DOCKER_VERSION client for macOS" - curl -o ~/kube-solo/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz + curl -o ~/kube-solo/bin/docker.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz # tarball with directory docker containing docker executable - tar -xzf docker-$DOCKER_VERSION.tgz + tar -xzf docker.tgz mv docker dockerdir mv dockerdir/docker . - rm docker-$DOCKER_VERSION.tgz - rmdir dockerdir + rm docker.tgz + rmdir -p dockerdir + # Make it executable + chmod +x ~/kube-solo/bin/docker else # docker client version INSTALLED_VERSION=$(~/kube-solo/bin/docker version | grep 'Version:' | awk '{print $2}' | tr -d '\r' | head -1 ) @@ -239,13 +241,15 @@ else cd ~/kube-solo/bin echo " " echo "Downloading docker $DOCKER_VERSION client for macOS" - curl -o ~/kube-solo/bin/docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz + curl -o ~/kube-solo/bin/docker.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz # tarball with directory docker containing docker executable - tar -xzf docker-$DOCKER_VERSION.tgz + tar -xzf docker.tgz mv docker dockerdir mv dockerdir/docker . - rm docker-$DOCKER_VERSION.tgz - rmdir dockerdir + rm docker.tgz + rmdir -p dockerdir + # Make it executable + chmod +x ~/kube-solo/bin/docker else echo " " echo "macOS docker client is up to date with VM's version ..." diff --git a/src/k8s/add-ons/dashboard-controller.yaml b/src/k8s/add-ons/dashboard-controller.yaml index 28d8230..65ec641 100644 --- a/src/k8s/add-ons/dashboard-controller.yaml +++ b/src/k8s/add-ons/dashboard-controller.yaml @@ -1,30 +1,27 @@ # This file should be kept in sync with cluster/gce/coreos/kube-manifests/addons/dashboard/dashboard-controller.yaml -apiVersion: v1 -kind: ReplicationController +apiVersion: extensions/v1beta1 +kind: Deployment metadata: - name: kubernetes-dashboard-v1.4.0 + name: kubernetes-dashboard namespace: kube-system labels: k8s-app: kubernetes-dashboard - version: v1.4.0 kubernetes.io/cluster-service: "true" spec: - replicas: 1 selector: - k8s-app: kubernetes-dashboard + matchLabels: + k8s-app: kubernetes-dashboard template: metadata: labels: k8s-app: kubernetes-dashboard - 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.4.0 + image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.2 resources: # keep request = limit to keep this container in guaranteed class limits: diff --git a/src/k8s/kube.tgz b/src/k8s/kube.tgz index c843f90..e4a2c6d 100644 --- a/src/k8s/kube.tgz +++ b/src/k8s/kube.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4753de6fa44e4c00d44137f604b13ecd05f4651e72211c0e01bd282318da2c68 -size 106409959 +oid sha256:20cd5eb6b4cfe2f3e27837983415d704ddd2f4ff3c1b19605e44789d900bed91 +size 106026337 diff --git a/src/k8s/kubectl b/src/k8s/kubectl index c58209d..c80bdc0 100755 --- a/src/k8s/kubectl +++ b/src/k8s/kubectl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b3531252f43b1875ac47a96ac1cbeb2d5e780d4a3522bd09c9f47263138cd1e -size 63732864 +oid sha256:d620250527e5f419f09e4d73af040842d4fe8655ffa9bf771a8ee41da899c79b +size 63388912