Upgrade Calico CNI to v3.23

[iec.git] / src / foundation / scripts / k8s_common.sh

diff --git a/src/foundation/scripts/k8s_common.sh b/src/foundation/scripts/k8s_common.sh
index 2aae30f..4002ca8 100755 (executable)
--- 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
   ;;
 *)
@@ -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 python-pip
+  sudo apt install -y software-properties-common apt-transport-https curl python3-pip
 
   # Install Docker as Prerequisite
   curl -4fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -66,6 +66,7 @@ debian)
   cat <<-EOF | sudo tee /etc/apt/sources.list.d/kubernetes.list
 deb https://apt.kubernetes.io/ kubernetes-xenial main
 EOF
+  sudo apt remove -f kubeadm kubectl kubernetes-cni kubelet
   sudo apt update
   # Minor fix for broken kubernetes-cni dependency in upstream xenial repo
   sudo apt install -y \