X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_kubeadm_cluster.sh;h=51e815aadbbfa02105b06cb20c8f7f5a22586eb0;hb=2886e571e871586adbcb3da091110da188722ccd;hp=03b7d79b29c13288caae34abb325cf6fcb06ebcf;hpb=171bbd48411e256e22156c56aa10d1cd2f8ca0da;p=osm%2Fdevops.git

diff --git a/installers/install_kubeadm_cluster.sh b/installers/install_kubeadm_cluster.sh
index 03b7d79b..51e815aa 100755
--- a/installers/install_kubeadm_cluster.sh
+++ b/installers/install_kubeadm_cluster.sh
@@ -15,7 +15,8 @@
 
 set +eux
 
-K8S_VERSION=1.23.3-00
+K8S_VERSION=1.29
+K8S_PACKAGE_VERSION="$K8S_VERSION".3-1.1
 
 # installs kubernetes packages
 function install_kube() {
@@ -23,16 +24,12 @@ function install_kube() {
     # 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}'
-    sudo apt-get update && sudo apt-get install -y apt-transport-https
-    sudo apt-get update && sudo apt-get install -y apt-transport-https
-    curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
-    sudo add-apt-repository "deb https://apt.kubernetes.io/ kubernetes-xenial main"
-    sudo apt-get update
+    sudo apt-get -y update && sudo apt-get install -y apt-transport-https ca-certificates curl
+    curl -fsSL https://pkgs.k8s.io/core:/stable:/v"$K8S_VERSION"/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
+    echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v'$K8S_VERSION'/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
+    sudo apt-get -y 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-get install -y kubelet=${K8S_PACKAGE_VERSION} kubeadm=${K8S_PACKAGE_VERSION} kubectl=${K8S_PACKAGE_VERSION}
     sudo apt-mark hold kubelet kubeadm kubectl
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
@@ -46,7 +43,7 @@ function check_and_track_kube_install() {
     [ -n "${kubeadm_version}" ] || FATAL_TRACK k8scluster "Kubeadm was not installed."
     kubectl_version=$(dpkg -s kubectl|grep Version|awk '{print $2}')
     [ -n "${kubectl_version}" ] || FATAL_TRACK k8scluster "Kubectl was not installed."
-    track k8scluster install_k8s_ok kubelet ${kubelet_version} none none kubeadm ${kubeadm_version} none none kubectl ${kubectl_version} none none
+    track k8scluster install_k8s_ok none none none kubelet ${kubelet_version} none none kubeadm ${kubeadm_version} none none kubectl ${kubectl_version} none none
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
@@ -55,7 +52,7 @@ function init_kubeadm() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     sudo swapoff -a
     sudo sed -i.bak '/.*none.*swap/s/^\(.*\)$/#\1/g' /etc/fstab
-    sudo kubeadm init --dry-run || FATAL_TRACK k8scluster "kubeadm init dry-run failed"
+    sudo kubeadm init --config $1 --dry-run || FATAL_TRACK k8scluster "kubeadm init dry-run failed"
     sudo kubeadm init --config $1
     sleep 5
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
@@ -75,6 +72,7 @@ function kube_config_dir() {
 # test kubernetes installation
 function check_and_track_init_k8s() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
+    echo "Reading existing namespaces"
     kubectl get ns || FATAL_TRACK k8scluster "Failed getting namespaces"
     track k8scluster init_k8s_ok
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
@@ -96,8 +94,8 @@ function deploy_cni_provider() {
 # taints K8s master node
 function taint_master_node() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    K8S_MASTER=$(kubectl get nodes | awk '$3~/master/'| awk '{print $1}')
-    kubectl taint node $K8S_MASTER node-role.kubernetes.io/master:NoSchedule-
+    K8S_MASTER=$(kubectl get nodes | awk '$3~/control-plane/'| awk '{print $1; exit}')
+    kubectl taint node $K8S_MASTER node-role.kubernetes.io/control-plane:NoSchedule-
     sleep 5
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
@@ -110,35 +108,10 @@ function check_and_track_k8s_ready_before_helm() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
-#Install Helm v3
-#Helm releases can be found here: https://github.com/helm/helm/releases
-function install_helm() {
-    [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    HELM_VERSION="v3.11.3"
-    if ! [[ "$(helm version --short 2>/dev/null)" =~ ^v3.* ]]; then
-        # Helm is not installed. Install helm
-        echo "Helm3 is not installed, installing ..."
-        curl https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz --output helm-${HELM_VERSION}.tar.gz
-        tar -zxvf helm-${HELM_VERSION}.tar.gz
-        sudo mv linux-amd64/helm /usr/local/bin/helm
-        rm -r linux-amd64
-        rm helm-${HELM_VERSION}.tar.gz
-    else
-        echo "Helm3 is already installed. Skipping installation..."
-    fi
-    helm version || FATAL_TRACK k8scluster "Could not obtain helm version. Maybe helm client was not installed"
-    helm repo add stable https://charts.helm.sh/stable || FATAL_TRACK k8scluster "Helm repo stable could not be added"
-    helm repo update || FATAL_TRACK k8scluster "Helm repo stable could not be updated"
-    [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
-}
-
 function install_k8s_storageclass() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    echo "Installing open-iscsi"
-    sudo apt-get update
-    sudo apt-get install open-iscsi
-    sudo systemctl enable --now iscsid
-    OPENEBS_VERSION="3.1.0"
+    # Openebs versions can be found here: https://github.com/openebs/openebs/releases
+    OPENEBS_VERSION="3.7.0"
     echo "Installing OpenEBS"
     helm repo add openebs https://openebs.github.io/charts
     helm repo update
@@ -170,17 +143,27 @@ function install_k8s_storageclass() {
 function install_helm_metallb() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
     echo "Installing MetalLB"
-    METALLB_VERSION="0.11.0"
-    METALLB_IP_RANGE="$DEFAULT_IP/32"
-    echo "configInline:
-  address-pools:
-   - name: default
-     protocol: layer2
-     addresses:
-     - $METALLB_IP_RANGE" | sudo tee -a ${OSM_DOCKER_WORK_DIR}/metallb-config.yaml
+    METALLB_VERSION="0.13.10"
     helm repo add metallb https://metallb.github.io/metallb
     helm repo update
-    helm install --create-namespace --namespace metallb-system metallb metallb/metallb --version ${METALLB_VERSION} -f ${OSM_DOCKER_WORK_DIR}/metallb-config.yaml
+    helm install --create-namespace --namespace metallb-system metallb metallb/metallb --version ${METALLB_VERSION}
+    [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
+}
+
+function configure_ipaddresspool_metallb() {
+    [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
+    echo "Creating IP address pool manifest: ${OSM_CLUSTER_WORK_DIR}/metallb-ipaddrpool.yaml"
+    METALLB_IP_RANGE="$DEFAULT_IP/32"
+    echo "apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  name: first-pool
+  namespace: metallb-system
+spec:
+  addresses:
+  - ${METALLB_IP_RANGE}" | sudo tee -a ${OSM_CLUSTER_WORK_DIR}/metallb-ipaddrpool.yaml
+    echo "Applying IP address pool manifest: kubectl apply -f ${OSM_CLUSTER_WORK_DIR}/metallb-ipaddrpool.yaml"
+    kubectl apply -f ${OSM_CLUSTER_WORK_DIR}/metallb-ipaddrpool.yaml || FATAL_TRACK k8scluster "Cannot create IP address Pool in MetalLB"
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
@@ -207,6 +190,7 @@ function check_for_readiness() {
     time_for_failure=200    # seconds broken
     OPENEBS_NAMESPACE=openebs
     METALLB_NAMESPACE=metallb-system
+    CERTMANAGER_NAMESPACE=cert-manager
     # STACK_NAME=osm          # By default, "osm"
 
     # Equivalent number of samples
@@ -229,8 +213,8 @@ function check_for_readiness() {
 
         # State of MetalLB
         METALLB_STATE=$(kubectl get pod -n ${METALLB_NAMESPACE} --no-headers 2>&1)
-        METALLB_READY=$(echo "${METALLB_STATE}" | awk '$2=="1/1" || $2=="2/2" {printf ("%s\t%s\t\n", $1, $2)}')
-        METALLB_NOT_READY=$(echo "${METALLB_STATE}" | awk '$2!="1/1" && $2!="2/2" {printf ("%s\t%s\t\n", $1, $2)}')
+        METALLB_READY=$(echo "${METALLB_STATE}" | awk '$2=="1/1" || $2=="4/4" {printf ("%s\t%s\t\n", $1, $2)}')
+        METALLB_NOT_READY=$(echo "${METALLB_STATE}" | awk '$2!="1/1" && $2!="4/4" {printf ("%s\t%s\t\n", $1, $2)}')
         COUNT_METALLB_READY=$(echo "${METALLB_READY}" | grep -v -e '^$' | wc -l)
         COUNT_METALLB_NOT_READY=$(echo "${METALLB_NOT_READY}" | grep -v -e '^$' | wc -l)
 
@@ -300,7 +284,8 @@ function check_for_readiness() {
 #removes osm deployments and services
 function remove_k8s_namespace() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    kubectl delete ns $1 2>&1 >/dev/null
+    echo "Deleting existing namespace $1: kubectl delete ns $1"
+    kubectl delete ns $1 2>/dev/null
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
@@ -311,7 +296,7 @@ while getopts ":D:d:i:-: " o; do
             DEFAULT_IP="${OPTARG}"
             ;;
         d)
-            OSM_DOCKER_WORK_DIR="${OPTARG}"
+            OSM_CLUSTER_WORK_DIR="${OPTARG}"
             ;;
         D)
             OSM_DEVOPS="${OPTARG}"
@@ -341,30 +326,30 @@ source $OSM_DEVOPS/common/track
 echo "DEBUG_INSTALL=$DEBUG_INSTALL"
 echo "DEFAULT_IP=$DEFAULT_IP"
 echo "OSM_DEVOPS=$OSM_DEVOPS"
-echo "OSM_DOCKER_WORK_DIR=$OSM_DOCKER_WORK_DIR"
+echo "OSM_CLUSTER_WORK_DIR=$OSM_CLUSTER_WORK_DIR"
 echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR"
 echo "HOME=$HOME"
 
+echo "Creating folders for installation"
+[ ! -d "$OSM_CLUSTER_WORK_DIR" ] && sudo mkdir -p $OSM_CLUSTER_WORK_DIR
+echo "Copying kubeadm-config from $OSM_DEVOPS/installers/kubeadm-config.yaml to $OSM_CLUSTER_WORK_DIR/kubeadm-config.yaml"
+sudo cp -b $OSM_DEVOPS/installers/kubeadm-config.yaml $OSM_CLUSTER_WORK_DIR/kubeadm-config.yaml
 
 install_kube
 check_and_track_kube_install
 
-init_kubeadm $OSM_DOCKER_WORK_DIR/cluster-config.yaml
+init_kubeadm $OSM_CLUSTER_WORK_DIR/kubeadm-config.yaml
 kube_config_dir
 check_and_track_init_k8s
 
-if [ -n "$INSTALL_K8S_MONITOR" ]; then
-    # uninstall OSM MONITORING
-    uninstall_k8s_monitoring
-    track k8scluster uninstall_k8s_monitoring_ok
-fi
-
-remove_k8s_namespace osm
 deploy_cni_provider
 taint_master_node
 check_and_track_k8s_ready_before_helm
 
-install_helm
+remove_k8s_namespace osm
+
+# install_helm has been moved to install_helm_client.sh, run from full_install_osm.sh,
+# but tracking is still here because the installation analytics still expects it
 track k8scluster install_helm_ok
 
 install_k8s_storageclass
@@ -375,4 +360,4 @@ install_helm_certmanager
 track k8scluster k8s_certmanager_ok
 check_for_readiness
 track k8scluster k8s_ready_ok
-
+configure_ipaddresspool_metallb