Merge pull request #411 from moelsayed/bump_k8s

Upgrade k8s to v1.8.9-rancher1-1
rancher · Mar 13, 2018 · 7b2e209 · 7b2e209
2 parents bc05bc2 + 5dcaf4b
commit 7b2e209
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/cluster.yml b/cluster.yml
@@ -102,7 +102,7 @@ addons: |-
 
 system_images:
   etcd: rancher/etcd:v3.0.17
-  kubernetes: rancher/k8s:v1.8.7-rancher1-1
+  kubernetes: rancher/k8s:v1.8.9-rancher1-1
   alpine: alpine:latest
   nginx_proxy: rancher/rke-nginx-proxy:v0.1.1
   cert_downloader: rancher/rke-cert-deployer:v0.1.1
@@ -126,7 +126,7 @@ authorization:
 # If set to true, rke won't fail when unsupported Docker version is found
 ignore_docker_version: false
 
-kubernetes_version: v1.8.7-rancher1-1
+kubernetes_version: v1.8.9-rancher1-1
 
 # List of registry credentials, if you are using a Docker Hub registry,
 # you can omit the `url` or set it to `docker.io`

diff --git a/cluster/defaults.go b/cluster/defaults.go
@@ -16,7 +16,7 @@ const (
 	DefaultClusterDomain         = "cluster.local"
 	DefaultClusterSSHKeyPath     = "~/.ssh/id_rsa"
 
-	DefaultK8sVersion = "v1.8.7-rancher1-1"
+	DefaultK8sVersion = v3.K8sV18
 
 	DefaultSSHPort        = "22"
 	DefaultDockerSockPath = "/var/run/docker.sock"

diff --git a/vendor.conf b/vendor.conf
@@ -24,4 +24,4 @@ github.com/coreos/go-semver              e214231b295a8ea9479f11b70b35d5acf3556d9
 github.com/ugorji/go/codec               ccfe18359b55b97855cee1d3f74e5efbda4869dc
 
 github.com/rancher/norman                151aa66e3e99de7e0d195e2d5ca96b1f95544555
-github.com/rancher/types                 6e5110239c1f18204f013a1158511d0f9e3e3e36
+github.com/rancher/types                 35773afb02d16506102fcbccc2f69514547b3767 
diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go