Skip to content

Commit 54f26d7

Browse files
authored
Merge pull request #2149 from CecileRobertMichon/fix-azure-quickstart
🏃Update Azure quickstart docs for new k8s version
2 parents 1855849 + b2523fb commit 54f26d7

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

docs/book/src/user/quick-start.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ export AZURE_CLIENT_SECRET_B64="$(echo -n "$AZURE_CLIENT_SECRET" | base64 | tr -
320320
SSH_KEY_FILE="capi-quickstart.ssh-key"
321321
ssh-keygen -t rsa -b 2048 -f "${SSH_KEY_FILE}" -N '' 1>/dev/null
322322
export SSH_PUBLIC_KEY=$(cat "${SSH_KEY_FILE}.pub" | base64 | tr -d '\r\n')
323+
# Change this value to the region you want to deploy the cluster in.
324+
export AZURE_LOCATION="southcentralus"
323325
```
324326

325327
```bash
@@ -339,7 +341,7 @@ metadata:
339341
cluster.x-k8s.io/control-plane: "true"
340342
cluster.x-k8s.io/cluster-name: "capi-quickstart"
341343
spec:
342-
version: v1.16.1
344+
version: v1.16.6
343345
bootstrap:
344346
configRef:
345347
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
@@ -355,12 +357,7 @@ kind: AzureMachine
355357
metadata:
356358
name: capi-quickstart-controlplane-0
357359
spec:
358-
image:
359-
offer: capi
360-
publisher: cncf-upstream
361-
sku: k8s-1dot16-ubuntu-1804
362-
version: latest
363-
location: southcentralus
360+
location: ${AZURE_LOCATION}
364361
osDisk:
365362
diskSizeGB: 30
366363
managedDisk:
@@ -893,6 +890,8 @@ export AZURE_CLIENT_SECRET_B64="$(echo -n "$AZURE_CLIENT_SECRET" | base64 | tr -
893890
SSH_KEY_FILE="capi-quickstart.ssh-key"
894891
ssh-keygen -t rsa -b 2048 -f "${SSH_KEY_FILE}" -N '' 1>/dev/null
895892
export SSH_PUBLIC_KEY=$(cat "${SSH_KEY_FILE}.pub" | base64 | tr -d '\r\n')
893+
# Change this value to the region you want to deploy the cluster in.
894+
export AZURE_LOCATION="southcentralus"
896895
```
897896

898897
```bash
@@ -926,7 +925,7 @@ spec:
926925
cluster.x-k8s.io/cluster-name: capi-quickstart
927926
nodepool: nodepool-0
928927
spec:
929-
version: v1.16.1
928+
version: v1.16.6
930929
bootstrap:
931930
configRef:
932931
name: capi-quickstart-node
@@ -944,13 +943,8 @@ metadata:
944943
spec:
945944
template:
946945
spec:
947-
location: southcentralus
946+
location: ${AZURE_LOCATION}
948947
vmSize: Standard_B2ms
949-
image:
950-
publisher: "cncf-upstream"
951-
offer: "capi"
952-
sku: "k8s-1dot16-ubuntu-1804"
953-
version: "latest"
954948
osDisk:
955949
osType: "Linux"
956950
diskSizeGB: 30

0 commit comments

Comments
 (0)