Skip to content

Commit

Permalink
Merge pull request #4899 from mboersma/bump-from-1.26
Browse files Browse the repository at this point in the history
Update references to unsupported k8s v1.26
  • Loading branch information
k8s-ci-robot authored Jun 5, 2024
2 parents 56259aa + 817ba47 commit 68df38e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/book/src/topics/managedcluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ spec:
resourceGroupName: foo-bar
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
subscriptionID: 00000000-0000-0000-0000-000000000000 # fake uuid
version: v1.26.6
version: v1.29.4
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 @@ -50,7 +50,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.26.6}"
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.29.5}"
export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE:-cluster-template.yaml}"

# identity secret settings.
Expand Down
2 changes: 1 addition & 1 deletion 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.26.1 \
clusterctl generate cluster my-cluster --kubernetes-version v1.29.5 \
--flavor private > my-cluster.yaml
```

Expand Down

0 comments on commit 68df38e

Please sign in to comment.