check for new k8s 1.32 versions, do not check for 1.27 or 1.28

packages/kubernetes/template/Dockerfile.127 → packages/kubernetes/template/Dockerfile.132

@@ -1,6 +1,6 @@
 FROM ubuntu:22.04
 RUN apt-get update
 RUN apt-get -y install curl apt-transport-https gnupg ca-certificates
-RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list
+RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.32/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.32/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list
 RUN apt-get update

packages/kubernetes/template/script.sh

@@ -5,6 +5,13 @@ set -euo pipefail
 # Populate VERSIONS array latest kURL-support versions (1.21, 1.22, 1.23, 1.24) available
 VERSIONS=()
 function find_available_versions() {
+    docker build -t k8s132 - < Dockerfile.132
+    local versions132=($(docker run k8s132 apt list -a kubelet 2>/dev/null | grep -Eo '1\.32\.[0-9]+' | sort -rV | uniq))
+    if [ ${#versions132[@]} -gt 0 ]; then
+        echo "Found latest version for Kubernetes 1.32: ${versions132[0]}"
+        VERSIONS+=("${versions132[0]}")
+    fi
+
     docker build -t k8s131 - < Dockerfile.131
     local versions131=($(docker run k8s131 apt list -a kubelet 2>/dev/null | grep -Eo '1\.31\.[0-9]+' | sort -rV | uniq))
     if [ ${#versions131[@]} -gt 0 ]; then
@@ -26,20 +33,6 @@ function find_available_versions() {
         VERSIONS+=("${versions129[0]}")
     fi
 
-    docker build -t k8s128 - < Dockerfile.128
-    local versions128=($(docker run k8s128 apt list -a kubelet 2>/dev/null | grep -Eo '1\.28\.[0-9]+' | sort -rV | uniq))
-    if [ ${#versions128[@]} -gt 0 ]; then
-        echo "Found latest version for Kubernetes 1.28: ${versions128[0]}"
-        VERSIONS+=("${versions128[0]}")
-    fi
-
-    docker build -t k8s127 - < Dockerfile.127
-    local versions127=($(docker run k8s127 apt list -a kubelet 2>/dev/null | grep -Eo '1\.27\.[0-9]+' | sort -rV | uniq))
-    if [ ${#versions127[@]} -gt 0 ]; then
-        echo "Found latest version for Kubernetes 1.27: ${versions127[0]}"
-        VERSIONS+=("${versions127[0]}")
-    fi
-
     echo "Found ${#VERSIONS[*]} versions for Kubernetes: ${VERSIONS[*]}"
 }
 
@@ -133,6 +126,13 @@ function get_latest_sonobuoy_release_version() {
 }
 
 function update_available_versions() {
+    local version132=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.32' ) )
+    if [ ${#version132[@]} -gt 0 ]; then
+        if ! sed '0,/cron-kubernetes-update-132/d' ../../../web/src/installers/versions.js | sed '/\],/,$d' | grep -q "${version132[0]}" ; then
+            sed -i "/cron-kubernetes-update-132/a\    \"${version132[0]}\"\," ../../../web/src/installers/versions.js
+        fi
+    fi
+
     local version131=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.31' ) )
     if [ ${#version131[@]} -gt 0 ]; then
         if ! sed '0,/cron-kubernetes-update-131/d' ../../../web/src/installers/versions.js | sed '/\],/,$d' | grep -q "${version131[0]}" ; then
@@ -153,20 +153,6 @@ function update_available_versions() {
             sed -i "/cron-kubernetes-update-129/a\    \"${version129[0]}\"\," ../../../web/src/installers/versions.js
         fi
     fi
-
-    local version128=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.28' ) )
-    if [ ${#version128[@]} -gt 0 ]; then
-        if ! sed '0,/cron-kubernetes-update-128/d' ../../../web/src/installers/versions.js | sed '/\],/,$d' | grep -q "${version128[0]}" ; then
-            sed -i "/cron-kubernetes-update-128/a\    \"${version128[0]}\"\," ../../../web/src/installers/versions.js
-        fi
-    fi
-
-    local version127=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.27' ) )
-    if [ ${#version127[@]} -gt 0 ]; then
-        if ! sed '0,/cron-kubernetes-update-127/d' ../../../web/src/installers/versions.js | sed '/\],/,$d' | grep -q "${version127[0]}" ; then
-            sed -i "/cron-kubernetes-update-127/a\    \"${version127[0]}\"\," ../../../web/src/installers/versions.js
-        fi
-    fi
 }
 
 function generate_step_versions() {

testgrid/specs/deploy.yaml

@@ -40,7 +40,7 @@
     - centos-9 # docker is not supported on rhel 9 variants
     - amazon-2023 # docker is not supported on amazon 2023
     - ubuntu-2404 # docker is not supported on Ubuntu 24.04
-- name: "Upgrade to 1.25 to 1.31, Migrate from Rook 1.12.x to OpenEBS + Minio"
+- name: "Upgrade to 1.25 to 1.32, Migrate from Rook 1.12.x to OpenEBS + Minio"
   flags: "yes"
   installerSpec:
     kubernetes:
@@ -59,7 +59,7 @@
       version: 1.12.x
   upgradeSpec:
     kubernetes:
-      version: 1.31.x
+      version: 1.32.x
     containerd:
       version: 1.6.x
     flannel:
@@ -166,11 +166,11 @@
     - centos-9 # centos 9 was not supported on kurl v2024.07.02-0
     - amazon-2023 # amazon 2023 isn't supported on installer version v2024.07.02-0.
     - ubuntu-2404 # Ubuntu 24.04 isn't supported on installer version v2024.07.02-0.
-- name: "Upgrade from k8s 1.27 to 1.31 - Airgap"
+- name: "Upgrade from k8s 1.28 to 1.32 - Airgap"
   airgap: true
   installerSpec:
     kubernetes:
-      version: 1.27.x
+      version: 1.28.x
     kurl:
       installerVersion: ""
     flannel:
@@ -189,7 +189,7 @@
       version: latest
   upgradeSpec:
     kubernetes:
-      version: 1.31.x
+      version: 1.32.x
     kurl:
       installerVersion: ""
     flannel:
@@ -216,10 +216,10 @@
   preUpgradeScript: |
     source /opt/kurl-testgrid/testhelpers.sh
     rhel_9_install_host_packages lvm2 conntrack-tools socat container-selinux git
-- name: k8s131x_cis_benchmarks_checks
+- name: k8s132x_cis_benchmarks_checks
   installerSpec:
     kubernetes:
-      version: "1.31.x"
+      version: "1.32.x"
       cisCompliance: true
     containerd:
       version: "latest"
@@ -235,10 +235,10 @@
     echo "Kubeconfig was $KUBECONFIG"
     unset KUBECONFIG
     kubectl get namespaces
-- name: "k8s_131x with kurl in-cluster support bundle spec"
+- name: "k8s_132x with kurl in-cluster support bundle spec"
   installerSpec:
     kubernetes:
-      version: "1.31.x"
+      version: "1.32.x"
     containerd:
       version: latest
     flannel:
@@ -251,10 +251,10 @@
     echo $supportBundle | base64 -d | grep 'kind: SupportBundle'
     echo "test if the support bundle has 'troubleshoot.io/kind: support-bundle' label"
     kubectl get secrets -n kurl kurl-supportbundle-spec -oyaml | grep 'troubleshoot.io/kind: support-bundle'
-- name: "k8s_131x with rook"
+- name: "k8s_132x with rook"
   installerSpec:
     kubernetes:
-      version: "1.31.x"
+      version: "1.32.x"
     containerd:
       version: latest
     flannel:

web/src/installers/versions.js

@@ -23,6 +23,7 @@ module.exports.InstallerVersions = {
     "1.17.7",
     "1.17.3",
     "1.16.4",
+    // cron-kubernetes-update-132
     // cron-kubernetes-update-131
     "1.31.5",
     "1.31.4",