Upgraded to Kubernetes 1.2.0.

pires · Mar 17, 2016 · a0faf8a · a0faf8a
1 parent 6bfbcee
commit a0faf8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ Most aspects of your cluster setup can be customized with environment variables.
 
  - **KUBERNETES_VERSION** defines the specific kubernetes version being used.
 
-   Defaults to `1.1.8`.
+   Defaults to `1.2.0`.
    Versions prior to `1.1.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
@@ -65,7 +65,7 @@ DOCKERCFG = File.expand_path(ENV['DOCKERCFG'] || "~/.dockercfg")
 
 DOCKER_OPTIONS = ENV['DOCKER_OPTIONS'] || ''
 
-KUBERNETES_VERSION = ENV['KUBERNETES_VERSION'] || '1.1.8'
+KUBERNETES_VERSION = ENV['KUBERNETES_VERSION'] || '1.2.0'
 
 CHANNEL = ENV['CHANNEL'] || 'alpha'
 #if CHANNEL != 'alpha'