Merge branch 'dev'

rimusz · Oct 14, 2015 · 27ca0fe · 27ca0fe
2 parents d1299bf + 51dfd7a
commit 27ca0fe
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/src/CoreOS k8s Solo/CoreOS k8s Solo-Info.plist b/src/CoreOS k8s Solo/CoreOS k8s Solo-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.5</string>
+	<string>0.2.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>47</string>
+	<string>51</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/first-init.command b/src/first-init.command
@@ -13,7 +13,7 @@ echo " "
 echo Installing Kubernetes Solo ...
 echo " "
 # install vagrant scp plugin
-vagrant plugin install vagrant-scp
+vagrant plugin install --plugin-version 0.4.1 vagrant-scp
 
 ### getting files from github and setting them up
 echo ""
@@ -33,6 +33,7 @@ sed -i "" 's/172.17.8.#{i+100}/172.19.17.99/g' ~/coreos-k8s-solo/kube/Vagrantfil
 cp ~/coreos-k8s-solo/tmp/config.rb.sample ~/coreos-k8s-solo/kube/config.rb
 sed -i "" 's/#$instance_name_prefix="core"/$instance_name_prefix="k8solo"/' ~/coreos-k8s-solo/kube/config.rb
 sed -i "" 's/#$vm_memory = 1024/$vm_memory = 1536/' ~/coreos-k8s-solo/kube/config.rb
+sed -i "" 's/File.open/#File.open/' ~/coreos-k8s-solo/kube/config.rb
 ###
 
 ### Set release channel

diff --git a/src/k8s/download_k8s.command b/src/k8s/download_k8s.command
@@ -15,12 +15,8 @@ rm -f *.tgz
 
 # get latest k8s version
 function get_latest_version_number {
-local -r latest_url="https://storage.googleapis.com/kubernetes-release/release/latest.txt"
-if [[ $(which wget) ]]; then
-  wget -qO- ${latest_url}
-elif [[ $(which curl) ]]; then
-  curl -Ss ${latest_url}
-fi
+ local -r latest_url="https://storage.googleapis.com/kubernetes-release/release/latest.txt"
+ curl -Ss ${latest_url}
 }
 
 K8S_VERSION=$(get_latest_version_number)

diff --git a/src/k8s/kube.tgz b/src/k8s/kube.tgz
diff --git a/src/update_k8s.command b/src/update_k8s.command
@@ -32,12 +32,8 @@ cd ~/coreos-k8s-solo/tmp
 
 # get latest k8s version
 function get_latest_version_number {
-local -r latest_url="https://storage.googleapis.com/kubernetes-release/release/latest.txt"
-if [[ $(which wget) ]]; then
-    wget -qO- ${latest_url}
-elif [[ $(which curl) ]]; then
-    curl -Ss ${latest_url}
-fi
+ local -r latest_url="https://storage.googleapis.com/kubernetes-release/release/latest.txt"
+ curl -Ss ${latest_url}
 }
 
 K8S_VERSION=$(get_latest_version_number)