diff --git a/src/Kube-Solo/Kube-Solo-Info.plist b/src/Kube-Solo/Kube-Solo-Info.plist index cc11147..bb83845 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.5.8 + 0.5.9 CFBundleSignature ???? CFBundleVersion - 173 + 175 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/src/bin/corectl b/src/bin/corectl index b058e54..440287f 100755 Binary files a/src/bin/corectl and b/src/bin/corectl differ diff --git a/src/bin/helm b/src/bin/helmc similarity index 69% rename from src/bin/helm rename to src/bin/helmc index 813ab9a..c840b51 100755 Binary files a/src/bin/helm and b/src/bin/helmc differ diff --git a/src/bin/install_deis b/src/bin/install_deis index f060987..5915421 100755 --- a/src/bin/install_deis +++ b/src/bin/install_deis @@ -14,36 +14,36 @@ vm_ip=$("${res_folder}"/bin/corectl q -i k8solo-01) # echo " " echo "If you have installed previous beta version of Deis Workflow PaaS, please uninstall it first" -echo "'$ helm uninstall workflow-beta2 -n deis' as currently any upgrade between Workflow betas is not supported yet ..." +echo "'$ helmc uninstall workflow-beta3 -n deis' as currently any upgrade between Workflow betas is not supported yet ..." echo " " pause 'Press [Enter] key to continue...' echo " " -# get lastest OS X helm version +# get lastest OS X helmc version current_folder=$(pwd) cd ~/kube-solo/bin echo " " -echo "Installing latest helm ..." +echo "Installing latest helmc ..." curl -s https://get.helm.sh | bash > /dev/null 2>&1 cd $current_folder -echo "helm is installed to ~/kube-solo/bin ... " +echo "helmc is installed to ~/kube-solo/bin ... " # run helm for the first time -helm up +helmc up # add Deis Chart repo -helm repo add deis https://github.com/deis/charts +helmc repo add deis https://github.com/deis/charts # get the latest version of all Charts from all repos -helm up +helmc up # delete the old folder if such exists -rm -rf ~/.helm/workspace/charts/workflow-beta3-kube-solo > /dev/null 2>&1 -# fetch Deis Workflow Chart to your helm's working directory -helm fetch deis/workflow-beta3 workflow-beta3-kube-solo -# run helm generate -helm generate -x manifests workflow-beta3-kube-solo +rm -rf ~/.helmc/workspace/charts/workflow-beta4-kube-solo > /dev/null 2>&1 +# fetch Deis Workflow Chart to your helmc's working directory +helmc fetch deis/workflow-beta4 workflow-beta4-kube-solo +# run helmc generate +helmc generate -x manifests workflow-beta4-kube-solo # update minio rc with persistent volume -cp -f "${res_folder}"/deis/deis-minio-rc.yaml ~/.helm/workspace/charts/workflow-beta3-kube-solo/manifests/deis-minio-rc.yaml +cp -f "${res_folder}"/deis/deis-minio-rc.yaml ~/.helmc/workspace/charts/workflow-beta4-kube-solo/manifests/deis-minio-rc.yaml # Install Deis -helm install workflow-beta3-kube-solo +helmc install workflow-beta4-kube-solo # Install deis client current_folder=$(pwd) @@ -68,7 +68,7 @@ until kubectl --namespace=deis get po | grep [d]eis-router- | grep "1/1" >/dev/ until kubectl --namespace=deis get po | grep [d]eis-controller- | grep "1/1" >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done # -sleep 5 +sleep 10 # run deis register user echo " " diff --git a/src/deis/deis-minio-rc.yaml b/src/deis/deis-minio-rc.yaml index 328f766..323439d 100644 --- a/src/deis/deis-minio-rc.yaml +++ b/src/deis/deis-minio-rc.yaml @@ -1,4 +1,3 @@ -#helm:generate helm tpl -d $HELM_GENERATE_DIR/tpl/generate_params.toml -o $HELM_GENERATE_DIR/manifests/deis-minio-rc.yaml $HELM_GENERATE_DIR/tpl/deis-minio-rc.yaml apiVersion: v1 kind: ReplicationController metadata: @@ -18,7 +17,7 @@ spec: serviceAccount: deis-minio containers: - name: deis-minio - image: quay.io/deis/minio:v2.0.0-beta3 + image: quay.io/deis/minio:v2.0.0-beta4 imagePullPolicy: IfNotPresent env: - name: HEALTH_SERVER_PORT @@ -51,7 +50,7 @@ spec: volumes: - name: minio-user secret: - secretName: minio-user + secretName: objectstorage-keyfile - name: home-minio hostPath: path: /data/deis/minio diff --git a/src/first-init.command b/src/first-init.command index 0e39268..de98d9c 100755 --- a/src/first-init.command +++ b/src/first-init.command @@ -44,16 +44,16 @@ start_vm install_k8s_files # -# download latest version of fleetctl and helm clients +# download latest version of fleetctl and helmc clients download_osx_clients # -# run helm for the first time -helm up +# run helmc for the first time +helmc up # add kube-charts repo -helm repo add kube-charts https://github.com/TheNewNormal/kube-charts +helmc repo add kube-charts https://github.com/TheNewNormal/kube-charts # Get the latest version of all Charts from repos -helm up +helmc up # set etcd endpoint export ETCDCTL_PEERS=http://$vm_ip:2379 diff --git a/src/functions.sh b/src/functions.sh index 3f5e2bd..5bacb65 100755 --- a/src/functions.sh +++ b/src/functions.sh @@ -200,14 +200,11 @@ fi # get lastest OS X helm version from bintray cd ~/kube-solo/bin -# curl -s https://get.helm.sh | bash > /dev/null 2>&1 -bin_version=$(curl -sI https://bintray.com/deis/helm/helm/_latestVersion | grep "Location:" | sed -n 's%.*helm/%%;s%/view.*%%p') -echo "Downloading latest version of helm for OS X" -curl -L "https://dl.bintray.com/deis/helm/helm-$bin_version-darwin-amd64.zip" -o helm.zip -unzip -o helm.zip > /dev/null 2>&1 -rm -f helm.zip +bin_version=$(curl -sI https://bintray.com/deis/helm/helmc/_latestVersion | grep "Location:" | sed -n 's%.*helm/%%;s%/view.*%%p') +echo "Downloading latest version of helmc for OS X" +curl -s https://get.helm.sh | bash > /dev/null 2>&1 echo " " -echo "Installed latest helm $bin_version to ~/kube-solo/bin ..." +echo "Installed latest helmc $bin_version to ~/kube-solo/bin ..." # } diff --git a/src/k8s/kube.tgz b/src/k8s/kube.tgz index 7c7e6c3..93a17a9 100644 Binary files a/src/k8s/kube.tgz and b/src/k8s/kube.tgz differ diff --git a/src/k8s/kubectl b/src/k8s/kubectl index 0fc9559..a416b09 100755 Binary files a/src/k8s/kubectl and b/src/k8s/kubectl differ diff --git a/src/up.command b/src/up.command index 9d67c00..fa4ed1c 100755 --- a/src/up.command +++ b/src/up.command @@ -24,7 +24,7 @@ fi mkdir ~/kube-solo/logs > /dev/null 2>&1 # copy bin files to ~/kube-solo/bin -rsync -r --verbose --exclude 'helm' "${res_folder}"/bin/* ~/kube-solo/bin/ > /dev/null 2>&1 +rsync -r --verbose --exclude 'helmc' "${res_folder}"/bin/* ~/kube-solo/bin/ > /dev/null 2>&1 rm -f ~/kube-solo/bin/gen_kubeconfig chmod 755 ~/kube-solo/bin/* diff --git a/src/update_osx_clients_files.command b/src/update_osx_clients_files.command index e9fec32..a2da65c 100755 --- a/src/update_osx_clients_files.command +++ b/src/update_osx_clients_files.command @@ -20,7 +20,7 @@ export PATH=${HOME}/kube-solo/bin:$PATH cp -f "${res_folder}"/bin/* ~/kube-solo/bin chmod 755 ~/kube-solo/bin/* -# download latest version of fleetctl and helm clients +# download latest version of fleetctl and helmc clients download_osx_clients #