From 3950556dd65fffedc42debcc7b1bfd9602b92814 Mon Sep 17 00:00:00 2001 From: Tomáš Levora Date: Thu, 3 Oct 2019 13:31:54 +0200 Subject: Update rke, kubectl and helm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit updates rke (implementing K8S 1.15.4), kubectl binary and helm binary with tiller image: rke 0.3.0 kubernetes 1.15.4 kubectl 1.15.4 helm 2.14.2 dashboard 2.0.0-beta4 Kubernetes dashboard is also updated to be compliant with the 1.15 K8S. Note 1: There is a new datalist to split rke only images from other K8S related images. Note 2: El Alto recommendation cannot be fullfilled to the letter, because rke does not have any release supporting 1.15.2 version of kubernetes (only experimental). Issue-ID: OOM-2122 Change-Id: I02cf0955158eca622bcac40ceed42588dbdd3499 Signed-off-by: Tomáš Levora Signed-off-by: Petr Ospalý Signed-off-by: Bartek Grzybowski --- ansible/roles/rke/defaults/main.yml | 55 +++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'ansible/roles/rke/defaults') diff --git a/ansible/roles/rke/defaults/main.yml b/ansible/roles/rke/defaults/main.yml index d9c044b6..71c0c622 100644 --- a/ansible/roles/rke/defaults/main.yml +++ b/ansible/roles/rke/defaults/main.yml @@ -6,6 +6,7 @@ kube_config_dir: "{{ ansible_env.HOME }}/.kube" cluster_config_dir: "{{ app_data_path }}/cluster" # Whether dashboard is exposed. rke_dashboard_exposed: true +rke_dns: {} rke_etcd: # By default rke creates bind mount: # /var/lib/etcd -> /var/lib/rancher/etcd @@ -48,30 +49,30 @@ rke_etcd: rke: # rke (rancher) images - etcd: rancher/coreos-etcd:v3.2.24-rancher1 - alpine: rancher/rke-tools:v0.1.27 - nginx_proxy: rancher/rke-tools:v0.1.27 - cert_downloader: rancher/rke-tools:v0.1.27 - kubernetes_services_sidecar: rancher/rke-tools:v0.1.27 - kubedns: rancher/k8s-dns-kube-dns:1.15.0 - dnsmasq: rancher/k8s-dns-dnsmasq-nanny:1.15.0 - kubedns_sidecar: rancher/k8s-dns-sidecar:1.15.0 - kubedns_autoscaler: rancher/cluster-proportional-autoscaler:1.0.0 - coredns: coredns/coredns:1.2.6 - coredns_autoscaler: rancher/cluster-proportional-autoscaler:1.0.0 - kubernetes: rancher/hyperkube:v1.13.5-rancher1 - flannel: rancher/coreos-flannel:v0.10.0-rancher1 - flannel_cni: rancher/flannel-cni:v0.3.0-rancher1 - calico_node: rancher/calico-node:v3.4.0 - calico_cni: rancher/calico-cni:v3.4.0 - calico_controllers: "" - calico_ctl: rancher/calico-ctl:v2.0.0 - canal_node: rancher/calico-node:v3.4.0 - canal_cni: rancher/calico-cni:v3.4.0 - canal_flannel: rancher/coreos-flannel:v0.10.0 - weave_node: weaveworks/weave-kube:2.5.0 - weave_cni: weaveworks/weave-npc:2.5.0 - pod_infra_container: rancher/pause:3.1 - ingress: rancher/nginx-ingress-controller:0.21.0-rancher3 - ingress_backend: rancher/nginx-ingress-controller-defaultbackend:1.4-rancher1 - metrics_server: rancher/metrics-server:v0.3.1 + etcd: "rancher/coreos-etcd:v3.3.10-rancher1" + alpine: "rancher/rke-tools:v0.1.50" + nginx_proxy: "rancher/rke-tools:v0.1.50" + cert_downloader: "rancher/rke-tools:v0.1.50" + kubernetes_services_sidecar: "rancher/rke-tools:v0.1.50" + kubedns: "rancher/k8s-dns-kube-dns:1.15.0" + dnsmasq: "rancher/k8s-dns-dnsmasq-nanny:1.15.0" + kubedns_sidecar: "rancher/k8s-dns-sidecar:1.15.0" + kubedns_autoscaler: "rancher/cluster-proportional-autoscaler:1.3.0" + coredns: "rancher/coredns-coredns:1.3.1" + coredns_autoscaler: "rancher/cluster-proportional-autoscaler:1.3.0" + kubernetes: "rancher/hyperkube:v1.15.4-rancher1" + flannel: "rancher/coreos-flannel:v0.11.0-rancher1" + flannel_cni: "rancher/flannel-cni:v0.3.0-rancher5" + calico_node: "rancher/calico-node:v3.7.4" + calico_cni: "rancher/calico-cni:v3.7.4" + calico_controllers: "rancher/calico-kube-controllers:v3.7.4" + calico_ctl: "rancher/calico-ctl:v2.0.0" + canal_node: "rancher/calico-node:v3.7.4" + canal_cni: "rancher/calico-cni:v3.7.4" + canal_flannel: "rancher/coreos-flannel:v0.11.0" + weave_node: "weaveworks/weave-kube:2.5.2" + weave_cni: "weaveworks/weave-npc:2.5.2" + pod_infra_container: "rancher/pause:3.1" + ingress: "rancher/nginx-ingress-controller:nginx-0.25.1-rancher1" + ingress_backend: "rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1" + metrics_server: "rancher/metrics-server:v0.3.3" -- cgit