X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=src%2Ffoundation%2Fscripts%2Fk8s_common.sh;h=2aae30f338c6eba9a0b9b3692d415bd9d3569a96;hb=55fbf4451a30337c7db112433126c07c091dbc07;hp=76092fdd2c3a988ad90b7e3517201b604d75bcc2;hpb=0ce548c0f2520c90939ef721cc3f2c9686129c35;p=iec.git diff --git a/src/foundation/scripts/k8s_common.sh b/src/foundation/scripts/k8s_common.sh index 76092fd..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.13.0}-00 - K8S_CNI_VERSION=${2:-0.6.0}-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.13.0}-0 - K8S_CNI_VERSION=${2:-0.6.0}-0 + KUBE_VERSION=${1:-1.19.0}-0 + K8S_CNI_VERSION=${2:-0.8.6}-0 KUBELET_CFG=/etc/sysconfig/kubelet ;; *) @@ -31,7 +31,7 @@ debian) # Install basic software echo "Acquire::ForceIPv4 \"true\";" | sudo tee -a /etc/apt/apt.conf.d/99force-ipv4 > /dev/null sudo apt update - sudo apt install -y software-properties-common apt-transport-https curl + sudo apt install -y software-properties-common apt-transport-https curl python-pip # Install Docker as Prerequisite curl -4fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - @@ -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