From: aticig <gulsum.atici@canonical.com>
Date: Thu, 3 Feb 2022 13:42:39 +0000 (+0300)
Subject: Bug 1841: LTS Support K8s upgrade
X-Git-Tag: v12.0.0rc1~47
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F11622%2F8;p=osm%2Fdevops.git

Bug 1841: LTS Support K8s upgrade

This fix changes the K8s version to 1.23 in installation scripts.

Change-Id: Id020ece215f62ac9633a5190392350dbb8da515a
Signed-off-by: aticig <gulsum.atici@canonical.com>
---

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index ef178e12..0ec01f76 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -40,7 +40,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
 # https://kubernetes.io/releases/
 RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
     && echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
-    && apt-get update && apt-get install -y kubectl=1.20.14-00
+    && apt-get update && apt-get install -y kubectl=1.23.3-00
 
 RUN curl https://get.helm.sh/helm-v2.17.0-linux-amd64.tar.gz --output helm-v2.17.0.tar.gz \
     && tar -zxvf helm-v2.17.0.tar.gz \
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 0f895cd6..82c70b1d 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -17,10 +17,10 @@
 
 LXD_VERSION=4.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.17
+JUJU_AGENT_VERSION=2.9.22
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
-MICROK8S_VERSION=1.20
+MICROK8S_VERSION=1.23
 OSMCLIENT_VERSION=10.0
 IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
 PATH=/snap/bin:${PATH}
diff --git a/installers/docker/cluster-config.yaml b/installers/docker/cluster-config.yaml
index 1d83bb64..3abec44f 100644
--- a/installers/docker/cluster-config.yaml
+++ b/installers/docker/cluster-config.yaml
@@ -14,7 +14,7 @@
 # limitations under the License
 # Author: Vijay Nag B S (vijaynag.bs@tataelxsi.co.in)
 
-apiVersion: kubeadm.k8s.io/v1beta1
+apiVersion: kubeadm.k8s.io/v1beta3
 kind: ClusterConfiguration
 networking:
   podSubnet: 10.244.0.0/16
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 830091cd..f31d46e1 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -876,7 +876,7 @@ function ctrl_c() {
 
 LXD_VERSION=4.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.17
+JUJU_AGENT_VERSION=2.9.22
 UNINSTALL=""
 DEVELOP=""
 UPDATE=""
diff --git a/installers/install_juju.sh b/installers/install_juju.sh
index 4ecf0a52..72c08cee 100755
--- a/installers/install_juju.sh
+++ b/installers/install_juju.sh
@@ -143,7 +143,7 @@ function juju_createproxy() {
 DEBUG_INSTALL=""
 INSTALL_CACHELXDIMAGES=""
 INSTALL_NOJUJU=""
-JUJU_AGENT_VERSION=2.9.17
+JUJU_AGENT_VERSION=2.9.22
 JUJU_VERSION=2.9
 OSM_DEVOPS=
 OSM_STACK_NAME=osm
diff --git a/installers/install_kubeadm_cluster.sh b/installers/install_kubeadm_cluster.sh
index 84a48729..70f6d9da 100755
--- a/installers/install_kubeadm_cluster.sh
+++ b/installers/install_kubeadm_cluster.sh
@@ -18,7 +18,7 @@ set +eux
 #installs kubernetes packages
 function install_kube() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    K8S_VERSION=1.20.14-00
+    K8S_VERSION=1.23.3-00
     # Kubernetes releases can be found here: https://kubernetes.io/releases/
     # To check other available versions, run the following command
     # curl -s https://packages.cloud.google.com/apt/dists/kubernetes-xenial/main/binary-amd64/Packages | grep Version | awk '{print $2}'
@@ -29,6 +29,9 @@ function install_kube() {
     sudo apt-get update
     echo "Installing Kubernetes Packages ..."
     sudo apt-get install -y kubelet=${K8S_VERSION} kubeadm=${K8S_VERSION} kubectl=${K8S_VERSION}
+    cat << EOF | sudo tee -a /etc/default/kubelet
+    KUBELET_EXTRA_ARGS="--cgroup-driver=cgroupfs"
+EOF
     sudo apt-mark hold kubelet kubeadm kubectl
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
@@ -97,7 +100,11 @@ function install_helm() {
 
 function install_k8s_storageclass() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    OPENEBS_VERSION="1.12.0"
+    echo "Installing open-iscsi"
+    sudo apt-get update
+    sudo apt-get install open-iscsi
+    sudo systemctl enable --now iscsid
+    OPENEBS_VERSION="3.1.0"
     echo "Installing OpenEBS"
     helm repo add openebs https://openebs.github.io/charts
     helm repo update