X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_kubeadm_cluster.sh;h=feb1e59b72fe53561913ae81ef4f2a00bbfae9d6;hb=refs%2Fchanges%2F90%2F14290%2F1;hp=0d5f12cb6d018f20041c18d5e777551eaa47c271;hpb=5b3f6b676b478e26c1a8e312fe55414410b6c523;p=osm%2Fdevops.git

diff --git a/installers/install_kubeadm_cluster.sh b/installers/install_kubeadm_cluster.sh
index 0d5f12cb..feb1e59b 100755
--- a/installers/install_kubeadm_cluster.sh
+++ b/installers/install_kubeadm_cluster.sh
@@ -15,7 +15,8 @@
 
 set +eux
 
-K8S_VERSION=1.26.5-00
+K8S_VERSION=1.28
+K8S_PACKAGE_VERSION="$K8S_VERSION".2-1.1
 
 # installs kubernetes packages
 function install_kube() {
@@ -24,12 +25,11 @@ function install_kube() {
     # 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 -y update && sudo apt-get install -y apt-transport-https ca-certificates curl
-    sudo install -m 0755 -d /etc/apt/keyrings
-    curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-archive-keyring.gpg
-    echo "deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list
+    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}
+    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
 }
@@ -212,6 +212,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
@@ -363,19 +364,14 @@ 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
-
 deploy_cni_provider
 taint_master_node
 check_and_track_k8s_ready_before_helm
 
 remove_k8s_namespace osm
 
-install_helm
+# 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