diff --git a/src/Kube-Solo/Kube-Solo-Info.plist b/src/Kube-Solo/Kube-Solo-Info.plist index 75a153e..03ee03e 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.6 + 0.5.7 CFBundleSignature ???? CFBundleVersion - 169 + 171 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/src/bin/install_deis b/src/bin/install_deis index b30fd12..0534998 100755 --- a/src/bin/install_deis +++ b/src/bin/install_deis @@ -3,9 +3,22 @@ # get App's Resources folder res_folder=$(cat ~/kube-solo/.env/resouces_path) +function pause(){ + read -p "$*" +} + + # get VM's IP 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-beta1 -n deis' as currently upgrade between Workflow betas is not supported yet ..." +echo " " +pause 'Press [Enter] key to continue...' +echo " " + # get lastest OS X helm version current_folder=$(pwd) cd ~/kube-solo/bin @@ -22,13 +35,13 @@ helm repo add deis https://github.com/deis/charts # get the latest version of all Charts from all repos helm up # fetch Deis Workflow Chart to your helm's working directory -helm fetch deis/workflow-beta1 +helm fetch deis/workflow-beta2 # run helm generate -helm generate -x manifests workflow-beta1 +helm generate -x manifests workflow-beta2 # update minio rc with persistent volume -cp -f "${res_folder}"/deis/deis-minio-rc.yaml ~/.helm/workspace/charts/workflow-beta1/manifests/deis-minio-rc.yaml +cp -f "${res_folder}"/deis/deis-minio-rc.yaml ~/.helm/workspace/charts/workflow-beta2/manifests/deis-minio-rc.yaml # Install Deis PaaS -helm install workflow-beta1 +helm install workflow-beta2 # Install deis client current_folder=$(pwd) @@ -57,8 +70,8 @@ sleep 5 # run deis register user echo " " -echo "Registering user ..." -deis register deis.$vm_ip.xip.io +echo "Registering admin user ..." +deis register deis.$vm_ip.nip.io # add ssh key to Deis PaaS echo " " @@ -66,11 +79,11 @@ echo "Adding ssh key to Deis Workflow PaaS ... " deis keys:add ~/.ssh/id_rsa.pub echo " " -echo "Cloning some demo Apps for testing ... " +echo "Cloning some demo Apps for testing to ~/kube-solo/deis/apps ... " rm -fr ~/kube-solo/deis/apps mkdir -p ~/kube-solo/deis/apps cd ~/kube-solo/deis/apps -git clone https://github.com/deis/example-ruby-sinatra.git +git clone https://github.com/deis/example-dockerfile-http git clone https://github.com/deis/helloworld.git git clone https://github.com/deis/example-go.git echo " " @@ -78,10 +91,10 @@ echo " " cd ~/kube-solo/deis/apps echo "Deis Workflow PaaS install is completed ..." -echo "Deis Workflow PaaS IP is http://deis.$vm_ip.xip.io " +echo "Deis Workflow PaaS IP is http://deis.$vm_ip.nip.io " echo " " echo "Please read how to:" -echo "Deploy Applications - http://docs-v2.readthedocs.org/en/latest/using-workflow/deploying-an-application/" +echo "To deploy Applications - http://docs-v2.readthedocs.org/en/latest/using-workflow/deploying-an-application/" echo "To manage Applications - http://docs-v2.readthedocs.org/en/latest/using-workflow/managing-an-application/" echo "Understanding Deis Workflow PaaS - http://docs-v2.readthedocs.org/en/latest/understanding-workflow/concepts/" echo " " diff --git a/src/deis/deis-minio-rc.yaml b/src/deis/deis-minio-rc.yaml index d8c5d59..b6f6aa8 100644 --- a/src/deis/deis-minio-rc.yaml +++ b/src/deis/deis-minio-rc.yaml @@ -1,3 +1,4 @@ +#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: @@ -17,7 +18,7 @@ spec: serviceAccount: deis-minio containers: - name: deis-minio - image: quay.io/deis/minio:v2.0.0-beta1 + image: quay.io/deis/minio:v2.0.0-beta2 imagePullPolicy: IfNotPresent env: - name: HEALTH_SERVER_PORT @@ -42,18 +43,12 @@ spec: args: - "server /home/minio/" volumeMounts: - - name: minio-admin - mountPath: /var/run/secrets/deis/minio/admin - readOnly: true - name: minio-user mountPath: /var/run/secrets/deis/minio/user readOnly: true - name: home-minio mountPath: /home/minio volumes: - - name: minio-admin - secret: - secretName: minio-admin - name: minio-user secret: secretName: minio-user diff --git a/src/files/fleetctl b/src/files/fleetctl index a2d6d02..31f4c41 100755 Binary files a/src/files/fleetctl and b/src/files/fleetctl differ