diff --git a/Makefile b/Makefile index d72096d6e1e..b2985ec3f28 100644 --- a/Makefile +++ b/Makefile @@ -121,7 +121,7 @@ GINKGO_VER := $(shell go list -m -f '{{.Version}}' github.com/onsi/ginkgo/v2) GINKGO_BIN := ginkgo GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER) -KUBECTL_VER := v1.32.2 +KUBECTL_VER := v1.33.6 KUBECTL_BIN := kubectl KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER) diff --git a/Tiltfile b/Tiltfile index 0cef0f8d93a..070069d3af3 100644 --- a/Tiltfile +++ b/Tiltfile @@ -25,7 +25,7 @@ settings = { "capi_version": "v1.11.3", "caaph_version": "v0.5.2", "cert_manager_version": "v1.19.1", - "kubernetes_version": "v1.32.2", + "kubernetes_version": "v1.33.6", "aks_kubernetes_version": "v1.30.2", "flatcar_version": "3374.2.1", "azure_location": "eastus", diff --git a/docs/book/src/developers/development.md b/docs/book/src/developers/development.md index ab252ebe796..70ad848cc9b 100644 --- a/docs/book/src/developers/development.md +++ b/docs/book/src/developers/development.md @@ -388,7 +388,7 @@ export CONTROL_PLANE_MACHINE_COUNT=3 export AZURE_CONTROL_PLANE_MACHINE_TYPE="Standard_B2s" export AZURE_NODE_MACHINE_TYPE="Standard_B2s" export WORKER_MACHINE_COUNT=2 -export KUBERNETES_VERSION="v1.32.2" +export KUBERNETES_VERSION="v1.33.6" # Identity secret. export AZURE_CLUSTER_IDENTITY_SECRET_NAME="cluster-identity-secret" diff --git a/docs/book/src/managed/managedcluster.md b/docs/book/src/managed/managedcluster.md index 75859d18e66..b212e34417b 100644 --- a/docs/book/src/managed/managedcluster.md +++ b/docs/book/src/managed/managedcluster.md @@ -40,7 +40,7 @@ executing clusterctl. # Kubernetes values export CLUSTER_NAME="my-cluster" export WORKER_MACHINE_COUNT=2 -export KUBERNETES_VERSION="v1.32.2" +export KUBERNETES_VERSION="v1.33.6" # Azure values export AZURE_LOCATION="southcentralus" @@ -357,7 +357,7 @@ spec: resourceGroupName: foo-bar sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""} subscriptionID: 00000000-0000-0000-0000-000000000000 # fake uuid - version: v1.32.2 + version: v1.33.6 identity: type: UserAssigned userAssignedIdentityResourceID: /subscriptions/00000000-0000-0000-0000-00000000/resourcegroups//providers/Microsoft.ManagedIdentity/userAssignedIdentities/ diff --git a/hack/create-dev-cluster.sh b/hack/create-dev-cluster.sh index 8184e536b3c..7fe3d6a92eb 100755 --- a/hack/create-dev-cluster.sh +++ b/hack/create-dev-cluster.sh @@ -53,7 +53,7 @@ export CONTROL_PLANE_MACHINE_COUNT=${CONTROL_PLANE_MACHINE_COUNT:-3} export AZURE_CONTROL_PLANE_MACHINE_TYPE="${CONTROL_PLANE_MACHINE_TYPE:-Standard_B2s}" export AZURE_NODE_MACHINE_TYPE="${NODE_MACHINE_TYPE:-Standard_B2s}" export WORKER_MACHINE_COUNT=${WORKER_MACHINE_COUNT:-2} -export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.2}" +export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.33.6}" export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE:-cluster-template.yaml}" # identity secret settings. diff --git a/templates/flavors/README.md b/templates/flavors/README.md index 5a2397f36cc..a619e33282a 100644 --- a/templates/flavors/README.md +++ b/templates/flavors/README.md @@ -4,7 +4,7 @@ In `clusterctl` the infrastructure provider authors can provide different type o or flavors; use the --flavor flag to specify which flavor to use; e.g ```shell -clusterctl generate cluster my-cluster --kubernetes-version v1.32.2 \ +clusterctl generate cluster my-cluster --kubernetes-version v1.33.6 \ --flavor private > my-cluster.yaml ``` @@ -66,7 +66,7 @@ worker-templates: AZURE_LOCATION: eastus AZURE_RESOURCE_GROUP: test-resource-group-name CONTROL_PLANE_MACHINE_COUNT: "1" - KUBERNETES_VERSION: v1.32.2 + KUBERNETES_VERSION: v1.33.6 AZURE_CONTROL_PLANE_MACHINE_TYPE: Standard_B2s WORKER_MACHINE_COUNT: "2" AZURE_NODE_MACHINE_TYPE: Standard_B2s @@ -88,6 +88,6 @@ worker-templates: metadata: AZURE_CONTROL_PLANE_MACHINE_TYPE: Standard_B2s AZURE_LOCATION: southcentralus - KUBERNETES_VERSION: v1.32.2 + KUBERNETES_VERSION: v1.33.6 WORKER_MACHINE_COUNT: "1" ``` diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml index 1a863ed531d..6968d3d3b77 100644 --- a/test/e2e/config/azure-dev.yaml +++ b/test/e2e/config/azure-dev.yaml @@ -237,14 +237,14 @@ providers: variables: AKS_KUBERNETES_VERSION: "latest" AKS_KUBERNETES_VERSION_UPGRADE_FROM: "latest-1" - KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.32}" + KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.33}" FLATCAR_KUBERNETES_VERSION: "${FLATCAR_KUBERNETES_VERSION:-stable-1.26}" - KUBERNETES_VERSION_API_UPGRADE_FROM: "v1.31.9" + KUBERNETES_VERSION_API_UPGRADE_FROM: "v1.32.10" FLATCAR_VERSION: "${FLATCAR_VERSION:-latest}" ETCD_VERSION_UPGRADE_TO: "" # Use default COREDNS_VERSION_UPGRADE_TO: "" # Use default - KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-stable-1.32}" - KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-stable-1.31}" + KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-stable-1.33}" + KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-stable-1.32}" CNI: "${PWD}/templates/addons/calico.yaml" ADDONS_PATH: "${PWD}/templates/addons" REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"