Skip to content
Snippets Groups Projects
Commit 8eff33a4 authored by aticig's avatar aticig Committed by Mark Beierl
Browse files

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's avataraticig <gulsum.atici@canonical.com>
parent 6b220e3b
No related branches found
No related tags found
No related merge requests found
...@@ -34,15 +34,15 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ ...@@ -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 - \ 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 \ && 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 \ 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 \ && tar -zxvf helm-v2.17.0.tar.gz \
&& mv linux-amd64/helm /usr/local/bin/helm \ && mv linux-amd64/helm /usr/local/bin/helm \
&& rm -r linux-amd64/ && 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 \ 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.3.4.tar.gz \ && tar -zxvf helm-v3.7.2.tar.gz \
&& mv linux-amd64/helm /usr/local/bin/helm3 \ && mv linux-amd64/helm /usr/local/bin/helm3 \
&& rm -r linux-amd64/ && rm -r linux-amd64/
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
LXD_VERSION=4.0 LXD_VERSION=4.0
JUJU_VERSION=2.9 JUJU_VERSION=2.9
JUJU_AGENT_VERSION=2.9.17 JUJU_AGENT_VERSION=2.9.22
K8S_CLOUD_NAME="k8s-cloud" K8S_CLOUD_NAME="k8s-cloud"
KUBECTL="microk8s.kubectl" KUBECTL="microk8s.kubectl"
MICROK8S_VERSION=1.20 MICROK8S_VERSION=1.23
OSMCLIENT_VERSION=11.0 OSMCLIENT_VERSION=11.0
IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
PATH=/snap/bin:${PATH} PATH=/snap/bin:${PATH}
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# limitations under the License # limitations under the License
# Author: Vijay Nag B S (vijaynag.bs@tataelxsi.co.in) # Author: Vijay Nag B S (vijaynag.bs@tataelxsi.co.in)
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration kind: ClusterConfiguration
networking: networking:
podSubnet: 10.244.0.0/16 podSubnet: 10.244.0.0/16
......
...@@ -859,7 +859,7 @@ function parse_docker_registry_url() { ...@@ -859,7 +859,7 @@ function parse_docker_registry_url() {
LXD_VERSION=4.0 LXD_VERSION=4.0
JUJU_VERSION=2.9 JUJU_VERSION=2.9
JUJU_AGENT_VERSION=2.9.17 JUJU_AGENT_VERSION=2.9.22
UNINSTALL="" UNINSTALL=""
DEVELOP="" DEVELOP=""
UPDATE="" UPDATE=""
......
...@@ -143,7 +143,7 @@ function juju_createproxy() { ...@@ -143,7 +143,7 @@ function juju_createproxy() {
DEBUG_INSTALL="" DEBUG_INSTALL=""
INSTALL_CACHELXDIMAGES="" INSTALL_CACHELXDIMAGES=""
INSTALL_NOJUJU="" INSTALL_NOJUJU=""
JUJU_AGENT_VERSION=2.9.17 JUJU_AGENT_VERSION=2.9.22
JUJU_VERSION=2.9 JUJU_VERSION=2.9
OSM_DEVOPS= OSM_DEVOPS=
OSM_STACK_NAME=osm OSM_STACK_NAME=osm
......
...@@ -18,7 +18,7 @@ set +eux ...@@ -18,7 +18,7 @@ set +eux
#installs kubernetes packages #installs kubernetes packages
function install_kube() { function install_kube() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function [ -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 # 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}' # 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 sudo apt-get update && sudo apt-get install -y apt-transport-https
...@@ -28,6 +28,9 @@ function install_kube() { ...@@ -28,6 +28,9 @@ function install_kube() {
sudo apt-get update sudo apt-get update
echo "Installing Kubernetes Packages ..." echo "Installing Kubernetes Packages ..."
sudo apt-get install -y kubelet=${K8S_VERSION} kubeadm=${K8S_VERSION} kubectl=${K8S_VERSION} 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 sudo apt-mark hold kubelet kubeadm kubectl
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
} }
...@@ -92,7 +95,11 @@ function install_helm() { ...@@ -92,7 +95,11 @@ function install_helm() {
function install_k8s_storageclass() { function install_k8s_storageclass() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function [ -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" echo "Installing OpenEBS"
helm repo add openebs https://openebs.github.io/charts helm repo add openebs https://openebs.github.io/charts
helm repo update helm repo update
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment