diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-03-01 14:21:28 +0100 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-03-02 10:25:52 +0100 |
| commit | 02bb993b3348a917c38cb17eeb67a42fa2c28286 (patch) | |
| tree | ca18bec6b4e45e1ca6bc3209f04710920bc76c2d /ansible/roles/rke/templates | |
| parent | a1e934b617044370001491ea48dad94ec05f3f6a (diff) | |
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>
Diffstat (limited to 'ansible/roles/rke/templates')
| -rw-r--r-- | ansible/roles/rke/templates/cluster.yml.j2 | 31 |
1 files changed, 2 insertions, 29 deletions
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: "" |