From: trevor tao <trevor.tao@arm.com>
Date: Wed, 23 Jun 2021 14:46:40 +0000 (+0800)
Subject: Install the new k8s version and related components
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=12880df8a245f9b91631c4ee2c8681a55a33458a;hp=3da9015a869d219b522c40738981816f545ae449;p=iec.git

Install the new k8s version and related components

Signed-off-by: trevor tao <trevor.tao@arm.com>
Change-Id: Iccb680ca44ed05011b41ec71568b26e9b26ad1eb
Signed-off-by: trevor tao <trevor.tao@arm.com>
---

diff --git a/src/foundation/scripts/k8s_common.sh b/src/foundation/scripts/k8s_common.sh
index a8c83ce..2aae30f 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.15.0}-00
-  K8S_CNI_VERSION=${2:-0.7.5}-00
+  KUBE_VERSION=${1:-1.19.0}-00
+  K8S_CNI_VERSION=${2:-0.8.6}-00
   KUBELET_CFG=/etc/default/kubelet
   ;;
 rhel)
   DOCKER_VERSION=18.06.1.ce-3.el7
-  KUBE_VERSION=${1:-1.15.0}-0
-  K8S_CNI_VERSION=${2:-0.7.5}-0
+  KUBE_VERSION=${1:-1.19.0}-0
+  K8S_CNI_VERSION=${2:-0.8.6}-0
   KUBELET_CFG=/etc/sysconfig/kubelet
   ;;
 *)
@@ -41,7 +41,8 @@ debian)
     $(lsb_release -cs) \
     stable"
   sudo apt update
-  sudo apt install -y docker-ce=${DOCKER_VERSION}
+  #sudo apt install -y docker-ce=${DOCKER_VERSION}
+  sudo apt install -y docker-ce
   ;;
 rhel)
   sudo yum install -y yum-utils device-mapper-persistent-data lvm2