From 8eff33a4455f10fb0bff553a39e7966f0d566fde Mon Sep 17 00:00:00 2001 From: aticig Date: Wed, 2 Feb 2022 12:09:05 +0300 Subject: [PATCH] Bug 1841: LTS Support Helm Upgrading k8s version to 1.23, juju version to 2.9.22:, kubectl version to 1.23, helm version to 3.7.2. Change-Id: I651e246f5b72707bcb99cc6fff4f1b418fcd826c Signed-off-by: aticig --- docker/LCM/Dockerfile | 6 +++--- installers/charmed_install.sh | 4 ++-- installers/docker/cluster-config.yaml | 2 +- installers/full_install_osm.sh | 2 +- installers/install_juju.sh | 2 +- installers/install_kubeadm_cluster.sh | 11 +++++++++-- 6 files changed, 17 insertions(+), 10 deletions(-) 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 bb1a9da6..e11b2b5d 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=11.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 3447de1f..093f3416 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -859,7 +859,7 @@ function parse_docker_registry_url() { 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 cbcf506f..3b878a72 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 c0f067a4..bca1904e 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.11-00 + K8S_VERSION=1.23.3-00 # 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}' sudo apt-get update && sudo apt-get install -y apt-transport-https @@ -28,6 +28,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 } @@ -92,7 +95,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 -- 2.25.1