diff --git a/Makefile b/Makefile index f5723f652a..efb57edc2a 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo # Helper function to get dependency version from go.mod get_go_version = $(shell $(GO) list -m $1 | awk '{print $$2}') GINGKO_VER := $(call get_go_version,github.com/onsi/ginkgo/v2) -ENVTEST_K8S_VERSION := 1.29.x +ENVTEST_K8S_VERSION := 1.30.x # Define Docker related variables. Releases should modify and double check these vars. # REGISTRY ?= gcr.io/$(shell gcloud config get-value project) diff --git a/docs/api.md b/docs/api.md index d89c0c0c3c..182bed3057 100644 --- a/docs/api.md +++ b/docs/api.md @@ -127,7 +127,7 @@ spec: rollingUpdate: maxSurge: 1 type: RollingUpdate - version: v1.29.0 + version: v1.30.0 kubeadmConfigSpec: joinConfiguration: controlPlane: {} @@ -243,7 +243,7 @@ spec: namespace: metal3 nodeDrainTimeout: 0s providerID: metal3://68be298f-ed11-439e-9d51-6c5260faede6 - version: v1.29.0 + version: v1.30.0 ``` ## Metal3Machine @@ -413,10 +413,10 @@ metadata: spec: automatedCleaningMode: metadata image: - checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.29.0-raw.img.sha256sum + checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.30.0-raw.img.sha256sum checksumType: sha256 format: raw - url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.29.0-raw.img + url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.30.0-raw.img hostSelector: matchLabels: key1: value1 @@ -473,7 +473,7 @@ spec: name: md-0 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: Metal3MachineTemplate - version: v1.29.0 + version: v1.30.0 ``` ## KubeadmConfigTemplate @@ -557,10 +557,10 @@ spec: spec: automatedCleaningMode: metadata image: - checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.29.0-raw.img.sha256sum + checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.30.0-raw.img.sha256sum checksumType: sha256 format: raw - url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.29.0-raw.img + url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.30.0-raw.img hostSelector: matchLabels: key1: value1 diff --git a/docs/architecture.md b/docs/architecture.md index b38ef64c97..0f3a9663b8 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -404,7 +404,7 @@ spec: etcd: {} imageRepository: "" kind: ClusterConfiguration - kubernetesVersion: v1.29.0 + kubernetesVersion: v1.30.0 networking: dnsDomain: cluster.local podSubnet: 192.168.0.0/18 diff --git a/docs/dev-setup.md b/docs/dev-setup.md index 8dca9746eb..fd499a13e9 100644 --- a/docs/dev-setup.md +++ b/docs/dev-setup.md @@ -287,7 +287,7 @@ Please note, the precedence of variables is as follows: }, "metadata": {, "CONTROL_PLANE_MACHINE_COUNT": "1", - "KUBERNETES_VERSION": "v1.29.0", + "KUBERNETES_VERSION": "v1.30.0", "WORKER_MACHINE_COUNT": "2", } } diff --git a/examples/generate.sh b/examples/generate.sh index 1c46b76f39..b13f19a6b6 100755 --- a/examples/generate.sh +++ b/examples/generate.sh @@ -24,11 +24,11 @@ KUSTOMIZE="${SOURCE_DIR}/../hack/tools/bin/kustomize" # Cluster. export CLUSTER_NAME="${CLUSTER_NAME:-test1}" -export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.29.0}" +export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.30.0}" export CLUSTER_APIENDPOINT_HOST="${CLUSTER_APIENDPOINT_HOST:-192.168.111.249}" export CLUSTER_APIENDPOINT_PORT="${CLUSTER_APIENDPOINT_PORT:-6443}" -export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.29.0-raw.img}" -export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.29.0-raw.img.sha256sum}" +export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.30.0-raw.img}" +export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.30.0-raw.img.sha256sum}" export IMAGE_CHECKSUM_TYPE="${IMAGE_CHECKSUM_TYPE:-sha256}" export IMAGE_FORMAT="${IMAGE_FORMAT:-raw}" diff --git a/hack/ensure-kubectl.sh b/hack/ensure-kubectl.sh index 11a4356306..39b4f53528 100755 --- a/hack/ensure-kubectl.sh +++ b/hack/ensure-kubectl.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail GOPATH_BIN="$(go env GOPATH)/bin/" -MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.29.0"} +MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.30.0"} # Ensure the kubectl tool exists and is a viable version, or installs it verify_kubectl_version() diff --git a/hack/gen_tilt_settings.sh b/hack/gen_tilt_settings.sh index 868312b630..32126c3343 100755 --- a/hack/gen_tilt_settings.sh +++ b/hack/gen_tilt_settings.sh @@ -48,6 +48,6 @@ cat <tilt-settings.json { "capi_version": "${CAPIRELEASE}", "cert_manager_version": "v1.12.3", - "kubernetes_version": "${KUBERNETES_VERSION:-v1.29.0}" + "kubernetes_version": "${KUBERNETES_VERSION:-v1.30.0}" } EOF diff --git a/scripts/environment.sh b/scripts/environment.sh index 7d481114a6..c6cf4a4534 100644 --- a/scripts/environment.sh +++ b/scripts/environment.sh @@ -49,10 +49,10 @@ else fi export FROM_K8S_VERSION=${FROM_K8S_VERSION:-"v1.28.1"} -export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.29.0"} +export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.30.0"} # NOTE: kubectl sha256 must match the provided KUBERNETES_VERSION, and must be # provided in JJB for upgrade tests where version is different from the default -export KUBECTL_SHA256="${KUBECTL_SHA256:-0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5}" +export KUBECTL_SHA256="${KUBECTL_SHA256:-7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5}" # Can be overriden from jjbs export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"} diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml index 03112b5b61..9f6685180b 100644 --- a/test/e2e/config/e2e_conf.yaml +++ b/test/e2e/config/e2e_conf.yaml @@ -77,7 +77,7 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1.5/metadata.yaml" - # https://proxy.golang.org/sigs.k8s.io/cluster-api/@v/list + # https://proxy.golang.org/sigs.k8s.io/cluster-api/@v/list # https://proxy.golang.org/github.com/metal3-io/cluster-api-provider-metal3/@v/list @@ -118,7 +118,7 @@ providers: variables: CNI: "/tmp/calico.yaml" - KUBERNETES_VERSION: "v1.29.0" + KUBERNETES_VERSION: "v1.30.0" # INIT_WITH_KUBERNETES_VERSION will be used here # https://github.com/kubernetes-sigs/cluster-api/blob/bb377163f141d69b7a61479756ee96891f6670bd/test/e2e/clusterctl_upgrade.go#L170 # INIT_WITH_KUBERNETES_VERSION used by management cluster upgrade