1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-05 17:00:20 +00:00

bump k8s version

This commit is contained in:
moelsayed
2018-03-13 19:57:48 +02:00
parent bc05bc2dcc
commit 5dcaf4b573
4 changed files with 8 additions and 8 deletions

View File

@@ -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`

View File

@@ -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"

View File

@@ -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

View File

@@ -1,12 +1,12 @@
package v3
const (
K8sV1_8 = "v1.8.7-rancher1-1"
K8sV18 = "v1.8.9-rancher1-1"
)
var (
K8sVersionToRKESystemImages = map[string]RKESystemImages{
"v1.8.7-rancher1-1": v187SystemImages,
"v1.8.9-rancher1-1": v18SystemImages,
}
RancherK8sVersionToSystemImages = map[string]RancherSystemImages{
@@ -14,9 +14,9 @@ var (
}
// v187SystemImages defaults for rke and rancher 2.0
v187SystemImages = RKESystemImages{
v18SystemImages = RKESystemImages{
Etcd: "rancher/coreos-etcd:v3.0.17",
Kubernetes: "rancher/k8s:v1.8.7-rancher1-1",
Kubernetes: "rancher/k8s:" + K8sV18,
Alpine: "alpine:latest",
NginxProxy: "rancher/rke-nginx-proxy:v0.1.1",
CertDownloader: "rancher/rke-cert-deployer:v0.1.1",