From ec71dbb5329b5892c7fdd64f12a7ee84b1fd0758 Mon Sep 17 00:00:00 2001
From: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Date: Mon, 1 Mar 2021 14:21:28 +0100
Subject: Upgrade Kubernetes version deployed by RKE to v1.19.6

Manual system_images assignment in rke's cluster config
is dropped as for any particular kubernetes release Rancher
project holds a predefined, static map connecting Rancher's
Kubernetes version with particular system images, so it's
enough to define k8s version.

Ref.: https://rancher.com/docs/rke/latest/en/config-options/system-images/

Change-Id: I027589c86500bbc5260caaa4aef7065d23d2241c
Issue-ID: OOM-2686
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
---
 ansible/roles/rke/defaults/main.yml        | 32 ------------------------------
 ansible/roles/rke/templates/cluster.yml.j2 | 31 ++---------------------------
 2 files changed, 2 insertions(+), 61 deletions(-)

(limited to 'ansible/roles/rke')

diff --git a/ansible/roles/rke/defaults/main.yml b/ansible/roles/rke/defaults/main.yml
index c9d82d93..c0bd5ef8 100644
--- a/ansible/roles/rke/defaults/main.yml
+++ b/ansible/roles/rke/defaults/main.yml
@@ -50,35 +50,3 @@ rke_etcd:
   enabled_unsafe_volatile_storage: false
   # Size of the volatile storage - tmpfs (this will eat your RAM)
   tmpfs_size: 5G
-
-rke:
-  # rke (rancher) images
-  etcd: "rancher/coreos-etcd:v3.3.10-rancher1"
-  alpine: "rancher/rke-tools:v0.1.52"
-  nginx_proxy: "rancher/rke-tools:v0.1.52"
-  cert_downloader: "rancher/rke-tools:v0.1.52"
-  kubernetes_services_sidecar: "rancher/rke-tools:v0.1.52"
-  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.7.1"
-  coredns: "rancher/coredns-coredns:1.6.2"
-  coredns_autoscaler: "rancher/cluster-proportional-autoscaler:1.7.1"
-  kubernetes: "rancher/hyperkube:v1.15.9-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"
-  calico_flexvol: "rancher/calico-pod2daemon-flexvol:v3.10.2"
-  canal_node: "rancher/calico-node:v3.7.4"
-  canal_cni: "rancher/calico-cni:v3.7.4"
-  canal_flannel: "rancher/coreos-flannel:v0.11.0"
-  canal_flexvol: "rancher/calico-pod2daemon-flexvol:v3.10.2"
-  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"
diff --git a/ansible/roles/rke/templates/cluster.yml.j2 b/ansible/roles/rke/templates/cluster.yml.j2
index 53e9a09a..55447286 100644
--- a/ansible/roles/rke/templates/cluster.yml.j2
+++ b/ansible/roles/rke/templates/cluster.yml.j2
@@ -93,34 +93,7 @@ addons: ""
 addons_include:
 - "{{ cluster_config_dir }}/kubernetes-dashboard.yml"
 - "{{ cluster_config_dir }}/k8s-dashboard-user.yml"
-system_images:
-  etcd: "{{ rke.etcd }}"
-  alpine: "{{ rke.alpine }}"
-  nginx_proxy: "{{ rke.nginx_proxy }}"
-  cert_downloader: "{{ rke.cert_downloader }}"
-  kubernetes_services_sidecar: "{{ rke.kubernetes_services_sidecar }}"
-  kubedns: "{{ rke.kubedns }}"
-  dnsmasq: "{{ rke.dnsmasq }}"
-  kubedns_sidecar: "{{ rke.kubedns_sidecar }}"
-  kubedns_autoscaler: "{{ rke.kubedns_autoscaler }}"
-  coredns: "{{ rke.coredns }}"
-  coredns_autoscaler: "{{ rke.coredns_autoscaler }}"
-  kubernetes: "{{ rke.kubernetes }}"
-  flannel: "{{ rke.flannel }}"
-  flannel_cni: "{{ rke.flannel_cni }}"
-  calico_node: "{{ rke.calico_node }}"
-  calico_cni: "{{ rke.calico_cni }}"
-  calico_controllers: ""
-  calico_ctl: "{{ rke.calico_ctl }}"
-  canal_node: "{{ rke.canal_node }}"
-  canal_cni: "{{ rke.canal_cni }}"
-  canal_flannel: "{{ rke.canal_flannel }}"
-  weave_node: "{{ rke.weave_node }}"
-  weave_cni: "{{ rke.weave_cni }}"
-  pod_infra_container: "{{ rke.pod_infra_container }}"
-  ingress: "{{ rke.ingress }}"
-  ingress_backend: "{{ rke.ingress_backend }}"
-  metrics_server: "{{ rke.metrics_server }}"
+system_images: {}
 ssh_key_path: "{{ cluster_config_dir }}/cluster_key"
 ssh_cert_path: ""
 ssh_agent_auth: false
@@ -128,7 +101,7 @@ authorization:
   mode: none
   options: {}
 ignore_docker_version: false
-kubernetes_version: ""
+kubernetes_version: {{ rke_kubernetes_version }}
 private_registries: []
 ingress:
   provider: ""
-- 
cgit 1.2.3-korg