From: Trevor Tao <trevor.tao@arm.com>
Date: Tue, 12 Apr 2022 12:04:04 +0000 (+0000)
Subject: Merge "Upgrade k8s version to 1.22.0 and CNI 0.8.7"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=637ee7c9bcef020dfc1fb2766d37307737713db2;hp=eec06ce4207bdae6cbc7a174555bdf3ec3e391fb;p=iec.git

Merge "Upgrade k8s version to 1.22.0 and CNI 0.8.7"
---

diff --git a/src/foundation/scripts/k8s_common.sh b/src/foundation/scripts/k8s_common.sh
index 2aae30f..5331c12 100755
--- a/src/foundation/scripts/k8s_common.sh
+++ b/src/foundation/scripts/k8s_common.sh
@@ -9,14 +9,14 @@ fi
 case ${OS_ID_LIKE:-} in
 debian)
   DOCKER_VERSION=18.06.1~ce~3-0~ubuntu
-  KUBE_VERSION=${1:-1.19.0}-00
-  K8S_CNI_VERSION=${2:-0.8.6}-00
+  KUBE_VERSION=${1:-1.22.0}-00
+  K8S_CNI_VERSION=${2:-0.8.7}-00
   KUBELET_CFG=/etc/default/kubelet
   ;;
 rhel)
   DOCKER_VERSION=18.06.1.ce-3.el7
-  KUBE_VERSION=${1:-1.19.0}-0
-  K8S_CNI_VERSION=${2:-0.8.6}-0
+  KUBE_VERSION=${1:-1.22.0}-0
+  K8S_CNI_VERSION=${2:-0.8.7}-0
   KUBELET_CFG=/etc/sysconfig/kubelet
   ;;
 *)