Skip to content

Update all the kubernetes versions to 1.32 #5528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,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.29.10
KUBECTL_VER := v1.32.2
KUBECTL_BIN := kubectl
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)

Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ settings = {
"capi_version": "v1.10.2",
"caaph_version": "v0.2.5",
"cert_manager_version": "v1.17.2",
"kubernetes_version": "v1.30.2",
"kubernetes_version": "v1.32.2",
"aks_kubernetes_version": "v1.30.2",
"flatcar_version": "3374.2.1",
"azure_location": "eastus",
Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/developers/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.6"
export KUBERNETES_VERSION="v1.32.2"

# Identity secret.
export AZURE_CLUSTER_IDENTITY_SECRET_NAME="cluster-identity-secret"
Expand Down
4 changes: 2 additions & 2 deletions docs/book/src/managed/managedcluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ executing clusterctl.
# Kubernetes values
export CLUSTER_NAME="my-cluster"
export WORKER_MACHINE_COUNT=2
export KUBERNETES_VERSION="v1.27.3"
export KUBERNETES_VERSION="v1.32.2"

# Azure values
export AZURE_LOCATION="southcentralus"
Expand Down Expand Up @@ -357,7 +357,7 @@ spec:
resourceGroupName: foo-bar
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
subscriptionID: 00000000-0000-0000-0000-000000000000 # fake uuid
version: v1.29.4
version: v1.32.2
identity:
type: UserAssigned
userAssignedIdentityResourceID: /subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/<your-resource-group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<your-managed-identity>
Expand Down
2 changes: 1 addition & 1 deletion hack/create-dev-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.29.10}"
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.2}"
export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE:-cluster-template.yaml}"

# identity secret settings.
Expand Down
7 changes: 0 additions & 7 deletions templates/addons/calico-dual-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,3 @@ installation:
encapsulation: None
natOutgoing: Enabled
nodeSelector: all()
registry: mcr.microsoft.com/oss
# Image and registry configuration for the tigera/operator pod.
tigeraOperator:
image: tigera/operator
registry: mcr.microsoft.com/oss
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
7 changes: 0 additions & 7 deletions templates/addons/calico-ipv6/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,3 @@ installation:
encapsulation: None
natOutgoing: Enabled
nodeSelector: all()
registry: mcr.microsoft.com/oss
# Image and registry configuration for the tigera/operator pod.
tigeraOperator:
image: tigera/operator
registry: mcr.microsoft.com/oss
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
6 changes: 3 additions & 3 deletions templates/flavors/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.29.5 \
clusterctl generate cluster my-cluster --kubernetes-version v1.32.2 \
--flavor private > my-cluster.yaml
```

Expand Down Expand Up @@ -66,7 +66,7 @@ worker-templates:
AZURE_LOCATION: eastus
AZURE_RESOURCE_GROUP: test-resource-group-name
CONTROL_PLANE_MACHINE_COUNT: "1"
KUBERNETES_VERSION: v1.22.1
KUBERNETES_VERSION: v1.32.2
AZURE_CONTROL_PLANE_MACHINE_TYPE: Standard_B2s
WORKER_MACHINE_COUNT: "2"
AZURE_NODE_MACHINE_TYPE: Standard_B2s
Expand All @@ -88,6 +88,6 @@ worker-templates:
metadata:
AZURE_CONTROL_PLANE_MACHINE_TYPE: Standard_B2s
AZURE_LOCATION: southcentralus
KUBERNETES_VERSION: v1.22.1
KUBERNETES_VERSION: v1.32.2
WORKER_MACHINE_COUNT: "1"
```
12 changes: 6 additions & 6 deletions test/e2e/config/azure-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@ providers:
variables:
AKS_KUBERNETES_VERSION: "latest"
AKS_KUBERNETES_VERSION_UPGRADE_FROM: "latest-1"
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.29}"
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.32}"
FLATCAR_KUBERNETES_VERSION: "${FLATCAR_KUBERNETES_VERSION:-stable-1.26}"
KUBERNETES_VERSION_API_UPGRADE_FROM: "v1.28.10"
KUBERNETES_VERSION_API_UPGRADE_FROM: "v1.31.9"
FLATCAR_VERSION: "${FLATCAR_VERSION:-latest}"
ETCD_VERSION_UPGRADE_TO: "3.5.10-0"
COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-stable-1.29}"
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-stable-1.28}"
ETCD_VERSION_UPGRADE_TO: "" # Use default
COREDNS_VERSION_UPGRADE_TO: "" # Use default
Comment on lines +213 to +214
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI I extracted this into its own PR so we can get this into release branches which I see are hitting issues with these versions: #5677

KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-stable-1.32}"
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-stable-1.31}"
CNI: "${PWD}/templates/addons/calico.yaml"
ADDONS_PATH: "${PWD}/templates/addons"
REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading