Merge pull request #90 from pires/0.17.0

Upgraded to Kubernetes v0.17.0.
pires · May 13, 2015 · f87269a · f87269a
2 parents 37e4fbd + 317bc76
commit f87269a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -131,8 +131,8 @@ Most aspects of your cluster setup can be customized with environment variables.
 
  - **KUBERNETES_VERSION** defines the specific kubernetes version being used.
 
-   Defaults to `0.16.2`.
-   Versions prior to `0.16.2` **won't work** with current cloud-config files.
+   Defaults to `0.17.0`.
+   Versions prior to `0.17.0` **won't work** with current cloud-config files.
 
  - **CLOUD_PROVIDER** defines the specific cloud provider being used. This is useful, for instance, if you're relying on kubernetes to set load-balancers for your services.
 

diff --git a/Vagrantfile b/Vagrantfile
@@ -55,7 +55,7 @@ NODE_YAML = File.join(File.dirname(__FILE__), "node.yaml")
 USE_DOCKERCFG = ENV['USE_DOCKERCFG'] || false
 DOCKERCFG = File.expand_path(ENV['DOCKERCFG'] || "~/.dockercfg")
 
-KUBERNETES_VERSION = ENV['KUBERNETES_VERSION'] || '0.16.2'
+KUBERNETES_VERSION = ENV['KUBERNETES_VERSION'] || '0.17.0'
 
 CHANNEL = ENV['CHANNEL'] || 'alpha'
 if CHANNEL != 'alpha'