Skip to content

Commit 79c2017

Browse files
authored
Merge pull request #38111 from kelbrown20/improving-location-setting-1956481
BZ:1956481 - Updating location value in yaml template
2 parents aafce35 + 4629924 commit 79c2017

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

modules/machineset-yaml-azure.adoc

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif::[]
1414
[id="machineset-yaml-azure_{context}"]
1515
= Sample YAML for a machine set custom resource on Azure
1616

17-
This sample YAML defines a machine set that runs in the `1` Microsoft Azure zone in the `centralus` region and creates nodes that are labeled with
17+
This sample YAML defines a machine set that runs in the `1` Microsoft Azure zone in a region and creates nodes that are labeled with
1818
ifndef::infra[`node-role.kubernetes.io/<role>: ""`.]
1919
ifdef::infra[`node-role.kubernetes.io/infra: ""`.]
2020

@@ -94,7 +94,12 @@ endif::infra[]
9494
version: ""
9595
internalLoadBalancer: ""
9696
kind: AzureMachineProviderSpec
97-
location: centralus
97+
ifndef::infra[]
98+
location: <region> <4>
99+
endif::infra[]
100+
ifdef::infra[]
101+
location: <region> <5>
102+
endif::infra[]
98103
managedIdentity: <infrastructure_id>-identity <1>
99104
metadata:
100105
creationTimestamp: null
@@ -116,10 +121,10 @@ endif::infra[]
116121
vmSize: qeci-22538-vnet
117122
vnet: <infrastructure_id>-vnet <1>
118123
ifndef::infra[]
119-
zone: "1" <4>
124+
zone: "1" <5>
120125
endif::infra[]
121126
ifdef::infra[]
122-
zone: "1" <5>
127+
zone: "1" <6>
123128
endif::infra[]
124129
----
125130
<1> Specify the infrastructure ID that is based on the cluster ID that you set when you provisioned the cluster. If you have the OpenShift CLI installed, you can obtain the infrastructure ID by running the following command:
@@ -148,15 +153,19 @@ $ oc -n openshift-machine-api \
148153
ifndef::infra[]
149154
<2> Specify the node label to add.
150155
<3> Specify the infrastructure ID, node label, and region.
151-
<4> Specify the zone within your region to place machines on. Be sure that your region supports the zone that you specify.
156+
<4> Specify the region to place machines on.
157+
<5> Specify the zone within your region to place machines on. Be sure that your region supports the zone that you specify.
152158
endif::infra[]
153159
ifdef::infra[]
154160
<2> Specify the `<infra>` node label.
155161
<3> Specify the infrastructure ID, `<infra>` node label, and region.
156162
<4> Specify a taint to prevent user workloads from being scheduled on infra nodes.
157-
<5> Specify the zone within your region to place machines on. Be sure that your region supports the zone that you specify.
163+
<5> Specify the region to place machines on.
164+
<6> Specify the zone within your region to place machines on. Be sure that your region supports the zone that you specify.
165+
158166
endif::infra[]
159167

168+
160169
ifeval::["{context}" == "creating-infrastructure-machinesets"]
161170
:!infra:
162171
endif::[]

0 commit comments

Comments
 (0)