From 8bf9d3eeeaf7bb086859507fbb503fb26ada7f36 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 31 Jan 2018 22:12:53 +0200 Subject: [PATCH] Add kubernetes version and pin etcd version in cluster.yml --- cluster.yml | 7 +++++-- cluster/defaults.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cluster.yml b/cluster.yml index 12cd7ad2..29056609 100644 --- a/cluster.yml +++ b/cluster.yml @@ -1,4 +1,7 @@ --- + +kubernetes_version: v1.8.5-rancher4 + auth: strategy: x509 options: @@ -35,7 +38,7 @@ private_registries: - url: registry.com user: Username passowrd: password - + nodes: - address: 1.1.1.1 user: ubuntu @@ -76,7 +79,7 @@ services: system_images: - etcd: quay.io/coreos/etcd:latest + etcd: quay.io/coreos/etcd:v3.0.17 kubernetes: rancher/k8s:v1.8.5-rancher4 alpine: alpine:latest nginx_proxy: rancher/rke-nginx-proxy:v0.1.1 diff --git a/cluster/defaults.go b/cluster/defaults.go index 4d9d3889..ae5026ea 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -23,7 +23,7 @@ const ( DefaultCertDownloaderImage = "rancher/rke-cert-deployer:v0.1.1" DefaultKubernetesServicesSidecarImage = "rancher/rke-service-sidekick:v0.1.0" - DefaultEtcdImage = "quay.io/coreos/etcd:latest" + DefaultEtcdImage = "quay.io/coreos/etcd:v3.0.17" DefaultK8sImage = "rancher/k8s:v1.8.5-rancher4" DefaultFlannelImage = "quay.io/coreos/flannel:v0.9.1"