From: Fatih Degirmenci <fdegir@gmail.com>
Date: Thu, 26 Aug 2021 10:31:08 +0000 (+0200)
Subject: Bump Kubernetes to v1.20.2
X-Git-Url: https://gerrit.nordix.org/gitweb?p=infra%2Fstack%2Fkubernetes.git;a=commitdiff_plain;h=ef59864c3f67317d9092f2bf363fead68ed4513a

Bump Kubernetes to v1.20.2

The branch 1.20 in infra/stack/kubernetes is created from the commit
3f7a6e0 on master which is a combination of various updates. [0]

The later commits on master branch make adaptations for rook and ceph
causing deployments on baremetal to fail so they are not included on
1.20 branch.

They need to be done in a controlled manner without breaking baremetal
deployments if possible.

[0] https://gerrit.nordix.org/c/infra/stack/kubernetes/+/7781

Change-Id: Iac2da682f639d2177b10162db95cd796fb3124e6
---

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 2023452..caed02c 100644
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -36,7 +36,7 @@ installers:
   kubespray:
     scm: git
     src: https://gerrit.nordix.org/infra/installer/kubespray.git
-    version: "{{ lookup('env', 'NORDIX_KUBESPRAY_VERSION') | default('master', true) }}"
+    version: "{{ lookup('env', 'NORDIX_KUBESPRAY_VERSION') | default('1.20', true) }}"
     refspec: "{{ lookup('env', 'NORDIX_KUBESPRAY_REFSPEC') | default(omit) }}"
 
 # NOTE (fdegir): this is only the list of scenarios implemented within
@@ -73,7 +73,7 @@ containerd_io_version: "1.2.13-2"
 # Kubernetes: Kubernetes and kubectl versions
 # -------------------------------------------------------------------------------
 # Kubernetes version that is supported by the pinned kubespray version
-kubernetes_version: "v1.18.5"
+kubernetes_version: "v1.20.2"
 # version of the kubectl should generally match to the version of kubernetes itself
 # but it would be good to have possibility to override it in case if someone needs it for some reason
 kubectl_version: "{{ kubernetes_version }}"