From: aticig <gulsum.atici@canonical.com>
Date: Fri, 4 Feb 2022 12:36:26 +0000 (+0300)
Subject: Bug 1841: LTS Support K8s, Helm upgrade
X-Git-Tag: v10.1.0-rc1~13
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=734099e0658888208578e3e5ef104dd068462a57;p=osm%2Fdevops.git

Bug 1841: LTS Support K8s, Helm upgrade

This fix upgrades the K8s to 1.23 and Helm to 3.7.2.

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

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 8669369a..99c198f9 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -34,15 +34,15 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
 
 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.4-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 \
     && mv linux-amd64/helm /usr/local/bin/helm \
     && rm -r linux-amd64/
 
-RUN curl https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz --output helm-v3.3.4.tar.gz \
-    && tar -zxvf helm-v3.3.4.tar.gz \
+RUN curl https://get.helm.sh/helm-v3.7.2-linux-amd64.tar.gz --output helm-v3.7.2.tar.gz \
+    && tar -zxvf helm-v3.7.2.tar.gz \
     && mv linux-amd64/helm /usr/local/bin/helm3 \
     && rm -r linux-amd64/
 
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index d40ef15c..25c98061 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -20,7 +20,7 @@ JUJU_VERSION=2.9
 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 f157c1c2..e0508daf 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -803,8 +803,11 @@ function install_kube() {
     sudo add-apt-repository "deb https://apt.kubernetes.io/ kubernetes-xenial main"
     sudo apt-get update
     echo "Installing Kubernetes Packages ..."
-    K8S_VERSION=1.20.11-00
+    K8S_VERSION=1.23.3-00
     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
 }
 
@@ -824,10 +827,14 @@ function kube_config_dir() {
 }
 
 function install_k8s_storageclass() {
+    echo "Installing open-iscsi"
+    sudo apt-get update
+    sudo apt-get install open-iscsi
+    sudo systemctl enable --now iscsid
     echo "Installing OpenEBS"
     helm repo add openebs https://openebs.github.io/charts
     helm repo update
-    helm install --create-namespace --namespace openebs openebs openebs/openebs --version 1.12.0
+    helm install --create-namespace --namespace openebs openebs openebs/openebs --version 3.1.0
     helm ls -n openebs
     local storageclass_timeout=400
     local counter=0