diff --git a/packages/kubernetes/template/Dockerfile.130 b/packages/kubernetes/template/Dockerfile.134 similarity index 69% rename from packages/kubernetes/template/Dockerfile.130 rename to packages/kubernetes/template/Dockerfile.134 index a09e8335af..3d41df774c 100644 --- a/packages/kubernetes/template/Dockerfile.130 +++ b/packages/kubernetes/template/Dockerfile.134 @@ -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.30/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.30/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list +RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.34/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.34/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list RUN apt-get update diff --git a/packages/kubernetes/template/script.sh b/packages/kubernetes/template/script.sh index ae8babff97..1abeb054fe 100755 --- a/packages/kubernetes/template/script.sh +++ b/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 k8s134 - < Dockerfile.134 + local versions134=($(docker run k8s134 apt list -a kubelet 2>/dev/null | grep -Eo '1\.34\.[0-9]+' | sort -rV | uniq)) + if [ ${#versions134[@]} -gt 0 ]; then + echo "Found latest version for Kubernetes 1.34: ${versions134[0]}" + VERSIONS+=("${versions134[0]}") + fi + docker build -t k8s133 - < Dockerfile.133 local versions133=($(docker run k8s133 apt list -a kubelet 2>/dev/null | grep -Eo '1\.33\.[0-9]+' | sort -rV | uniq)) if [ ${#versions133[@]} -gt 0 ]; then @@ -26,13 +33,6 @@ function find_available_versions() { VERSIONS+=("${versions131[0]}") fi - docker build -t k8s130 - < Dockerfile.130 - local versions130=($(docker run k8s130 apt list -a kubelet 2>/dev/null | grep -Eo '1\.30\.[0-9]+' | sort -rV | uniq)) - if [ ${#versions130[@]} -gt 0 ]; then - echo "Found latest version for Kubernetes 1.30: ${versions130[0]}" - VERSIONS+=("${versions130[0]}") - fi - echo "Found ${#VERSIONS[*]} versions for Kubernetes: ${VERSIONS[*]}" } @@ -126,6 +126,13 @@ function get_latest_sonobuoy_release_version() { } function update_available_versions() { + local version134=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.34' ) ) + if [ ${#version134[@]} -gt 0 ]; then + if ! sed '0,/cron-kubernetes-update-134/d' ../../../web/src/installers/versions.js | sed '/\],/,$d' | grep -q "${version134[0]}" ; then + sed -i "/cron-kubernetes-update-134/a\ \"${version134[0]}\"\," ../../../web/src/installers/versions.js + fi + fi + local version133=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.33' ) ) if [ ${#version133[@]} -gt 0 ]; then if ! sed '0,/cron-kubernetes-update-133/d' ../../../web/src/installers/versions.js | sed '/\],/,$d' | grep -q "${version133[0]}" ; then @@ -146,13 +153,6 @@ function update_available_versions() { sed -i "/cron-kubernetes-update-131/a\ \"${version131[0]}\"\," ../../../web/src/installers/versions.js fi fi - - local version130=( $( for i in "${VERSIONS[@]}" ; do echo $i ; done | grep '^1.30' ) ) - if [ ${#version130[@]} -gt 0 ]; then - if ! sed '0,/cron-kubernetes-update-130/d' ../../../web/src/installers/versions.js | sed '/\],/,$d' | grep -q "${version130[0]}" ; then - sed -i "/cron-kubernetes-update-130/a\ \"${version130[0]}\"\," ../../../web/src/installers/versions.js - fi - fi } function generate_step_versions() { diff --git a/testgrid/specs/deploy.yaml b/testgrid/specs/deploy.yaml index efcb6e9101..4bc2fdbddb 100644 --- a/testgrid/specs/deploy.yaml +++ b/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.33, Migrate from Rook 1.12.x to OpenEBS + Minio" +- name: "Upgrade to 1.25 to 1.34, 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.33.x + version: 1.34.x containerd: version: 1.6.x flannel: @@ -167,11 +167,11 @@ - 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. - rocky-96 # Not supported on pinned kurl version v2024.07.02-0 -- name: "Upgrade from k8s 1.29 to 1.33 - Airgap" +- name: "Upgrade from k8s 1.30 to 1.34 - Airgap" airgap: true installerSpec: kubernetes: - version: 1.29.x + version: 1.30.x kurl: installerVersion: "" flannel: @@ -190,7 +190,7 @@ version: latest upgradeSpec: kubernetes: - version: 1.33.x + version: 1.34.x kurl: installerVersion: "" flannel: @@ -219,10 +219,10 @@ rhel_9_install_host_packages lvm2 conntrack-tools socat container-selinux git unsupportedOSIDs: - centos-79 -- name: k8s132x_cis_benchmarks_checks +- name: k8s134x_cis_benchmarks_checks installerSpec: kubernetes: - version: "1.33.x" + version: "1.34.x" cisCompliance: true containerd: version: "latest" @@ -238,10 +238,10 @@ echo "Kubeconfig was $KUBECONFIG" unset KUBECONFIG kubectl get namespaces -- name: "k8s_133x with kurl in-cluster support bundle spec" +- name: "k8s_134x with kurl in-cluster support bundle spec" installerSpec: kubernetes: - version: "1.33.x" + version: "1.34.x" containerd: version: latest flannel: @@ -254,10 +254,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_133x with rook" +- name: "k8s_134x with rook" installerSpec: kubernetes: - version: "1.33.x" + version: "1.34.x" containerd: version: latest flannel: @@ -267,9 +267,9 @@ registry: version: 2.8.3 unsupportedOSIDs: - - centos-74 # Rook 1.8+ not supported on 3.10.0-693.el7.x86_64 kernel - - centos-79 # Rook 1.13+ is not supported on centos-7 - - ol-79 # Rook 1.13+ is not supported on centos-7 + - centos-74 # Rook 1.8+ not supported on 3.10.0-693.el7.x86_64 kernel + - centos-79 # Rook 1.13+ is not supported on centos-7 + - ol-79 # Rook 1.13+ is not supported on centos-7 preInstallScript: | source /opt/kurl-testgrid/testhelpers.sh if is_ubuntu_2404 ; then diff --git a/web/src/installers/versions.js b/web/src/installers/versions.js index cfd82ad6cb..15f2e4506b 100644 --- a/web/src/installers/versions.js +++ b/web/src/installers/versions.js @@ -23,6 +23,7 @@ module.exports.InstallerVersions = { "1.17.7", "1.17.3", "1.16.4", + // cron-kubernetes-update-134 // cron-kubernetes-update-133 "1.33.4", // cron-kubernetes-update-132 @@ -187,24 +188,24 @@ module.exports.InstallerVersions = { "1.21.11", "1.21.9", "1.21.8", - "1.21.5", - "1.21.4", - "1.21.3", - "1.21.2", - "1.21.1", + "1.21.5", + "1.21.4", + "1.21.3", + "1.21.2", + "1.21.1", "1.21.0", "1.20.15", "1.20.14", - "1.20.11", - "1.20.10", - "1.20.9", - "1.20.8", - "1.20.7", - "1.20.6", - "1.20.5", - "1.20.4", - "1.20.2", - "1.20.1", + "1.20.11", + "1.20.10", + "1.20.9", + "1.20.8", + "1.20.7", + "1.20.6", + "1.20.5", + "1.20.4", + "1.20.2", + "1.20.1", "1.20.0", ], containerd: [