bump k8s to v1.31.0-rc.0

Signed-off-by: Muhammad Adil Ghaffar <muhammad.adil.ghaffar@est.tech>
metal3-io · Aug 6, 2024 · 4e05b79 · 4e05b79
1 parent f14f11e
commit 4e05b79
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/common.sh b/lib/common.sh
@@ -334,7 +334,7 @@ export TARGET_NODE_MEMORY="${TARGET_NODE_MEMORY:-4096}"
 
 # Cluster
 export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
-export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.30.0}"
+export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.31.0-rc.0}"
 export KUBERNETES_BINARIES_VERSION="${KUBERNETES_BINARIES_VERSION:-${KUBERNETES_VERSION}}"
 export KUBERNETES_BINARIES_CONFIG_VERSION=${KUBERNETES_BINARIES_CONFIG_VERSION:-"v0.15.1"}
 
@@ -362,10 +362,10 @@ export MINIKUBE_SHA256="${MINIKUBE_SHA256:-4bfdc17f0dce678432d5c02c2a681c7a72921
 export MINIKUBE_DRIVER_SHA256="${MINIKUBE_DRIVER_SHA256:-83d3175eac710b1577209ddde5592c9071365bb281c6fc97ce5bd48106fc19ac}"
 
 # Kind, kind node image versions (if EPHEMERAL_CLUSTER=kind)
-export KIND_VERSION="${KIND_VERSION:-v0.22.0}"
-export KIND_SHA256="${KIND_SHA256:-e4264d7ee07ca642fe52818d7c0ed188b193c214889dd055c929dbcb968d1f62}"
+export KIND_VERSION="${KIND_VERSION:-v0.23.0}"
+export KIND_SHA256="${KIND_SHA256:-1d86e3069ffbe3da9f1a918618aecbc778e00c75f838882d0dfa2d363bc4a68c}"
 
-export KIND_NODE_IMAGE_VERSION="${KIND_NODE_IMAGE_VERSION:-v1.29.2}"
+export KIND_NODE_IMAGE_VERSION="${KIND_NODE_IMAGE_VERSION:-v1.30.0}"
 export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-${DOCKER_HUB_PROXY}/kindest/node:${KIND_NODE_IMAGE_VERSION}}"
 
 # Tilt

diff --git a/lib/releases.sh b/lib/releases.sh
@@ -84,7 +84,7 @@ elif [ "${CAPM3RELEASEBRANCH}" = "release-1.7" ]; then
 else
   # 1.7.99 points to the head of the main branch as well. Local override for CAPM3 is created for this version.
   export CAPM3RELEASE="v1.7.99"
-  export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.7.")}"
+  export CAPIRELEASE="v1.31.0-rc.0"
 fi
 
 CAPIBRANCH="${CAPIBRANCH:-${CAPIRELEASE}}"

diff --git a/tests/roles/run_tests/vars/main.yml b/tests/roles/run_tests/vars/main.yml
@@ -18,13 +18,13 @@ NODE_DRAIN_TIMEOUT: "{{ lookup('env', 'NODE_DRAIN_TIMEOUT') | default('0s', true
 BMOPATH: "{{ lookup('env', 'BMOPATH') }}"
 IRONIC_DATA_DIR: "{{ lookup('env', 'IRONIC_DATA_DIR') }}"
 KUBECONFIG_PATH: "/home/ubuntu/.kube/config"
-KUBERNETES_VERSION: "{{ lookup('env', 'KUBERNETES_VERSION') | default('v1.30.0', true) }}"
-UPGRADED_K8S_VERSION: "{{ lookup('env', 'UPGRADED_K8S_VERSION') | default('v1.30.0', true) }}"
+KUBERNETES_VERSION: "{{ lookup('env', 'KUBERNETES_VERSION') | default('v1.31.0-rc.0', true) }}"
+UPGRADED_K8S_VERSION: "{{ lookup('env', 'UPGRADED_K8S_VERSION') | default('v1.31.0-rc.0', true) }}"
 MAX_SURGE_VALUE: "{{ lookup('env', 'MAX_SURGE_VALUE') | default('1', true) }}"
 VM_EXTRADISKS: "{{ lookup('env', 'VM_EXTRADISKS') | default('false', true) }}"
 VM_EXTRADISKS_FILE_SYSTEM: "{{ lookup('env', 'VM_EXTRADISKS_FILE_SYSTEM') | default('ext4', true) }}"
 VM_EXTRADISKS_MOUNT_DIR: "{{ lookup('env', 'VM_EXTRADISKS_MOUNT_DIR') | default('/mnt/disk2') }}"
-KUBERNETES_BINARIES_VERSION: "{{ lookup('env', 'KUBERNETES_BINARIES_VERSION') | default(lookup('env', 'KUBERNETES_VERSION') | default('v1.30.0', true), true) }}"
+KUBERNETES_BINARIES_VERSION: "{{ lookup('env', 'KUBERNETES_BINARIES_VERSION') | default(lookup('env', 'KUBERNETES_VERSION') | default('v1.31.0-rc.0', true), true) }}"
 KUBERNETES_BINARIES_CONFIG_VERSION: "{{ lookup('env', 'KUBERNETES_BINARIES_CONFIG_VERSION') | default('v0.15.1', true) }}"
 IP_STACK: "{{ lookup('env', 'IP_STACK') | default('v4', true) }}"
 IPAM_PROVISIONING_POOL_RANGE_START: "{{ lookup('env', 'IPAM_PROVISIONING_POOL_RANGE_START') | default('172.22.0.100', true) }}"