Skip to content

Commit

Permalink
Merge pull request #327 from moelsayed/k8s_v1.8.7-rancher1-1
Browse files Browse the repository at this point in the history
Kubernetes default version: v1.8.7-rancher1-1
  • Loading branch information
Alena Prokharchyk authored Feb 7, 2018
2 parents c190592 + d77d034 commit b680851
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions cluster.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---

kubernetes_version: v1.8.5-rancher4
kubernetes_version: v1.8.7-rancher1-1

auth:
strategy: x509
Expand Down Expand Up @@ -89,7 +89,7 @@ services:

system_images:
etcd: rancher/etcd:v3.0.17
kubernetes: rancher/k8s:v1.8.5-rancher4
kubernetes: rancher/k8s:v1.8.7-rancher1-1
alpine: alpine:latest
nginx_proxy: rancher/rke-nginx-proxy:v0.1.1
cert_downloader: rancher/rke-cert-deployer:v0.1.1
Expand Down
2 changes: 1 addition & 1 deletion cluster/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const (
DefaultIngressController = "nginx"

DefaultEtcdImage = "rancher/etcd:v3.0.17"
DefaultK8sImage = "rancher/k8s:v1.8.5-rancher4"
DefaultK8sImage = "rancher/k8s:v1.8.7-rancher1-1"

DefaultFlannelImage = "rancher/coreos-flannel:v0.9.1"
DefaultFlannelCNIImage = "rancher/coreos-flannel-cni:v0.2.0"
Expand Down

0 comments on commit b680851

Please sign in to comment.