Skip to content

Commit 1d549ed

Browse files
authored
Merge pull request #70883 from jeana-redhat/OSDOCS-9463-azure-availabilitySet-label
OSDOCS-9463: Fix Azure availabilitySet label in spec
2 parents 0794327 + c4807ee commit 1d549ed

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

modules/machineset-yaml-azure.adoc

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ endif::infra[]
6868
metadata:
6969
creationTimestamp: null
7070
labels:
71-
machine.openshift.io/cluster-api-machineset: <machineset_name> <4>
71+
machine.openshift.io/cluster-api-machineset: <machineset_name>
7272
ifndef::infra[]
7373
node-role.kubernetes.io/<role>: "" <2>
7474
endif::infra[]
@@ -81,15 +81,15 @@ endif::infra[]
8181
credentialsSecret:
8282
name: azure-cloud-credentials
8383
namespace: openshift-machine-api
84-
image: <5>
84+
image: <4>
8585
offer: ""
8686
publisher: ""
87-
resourceID: /resourceGroups/<infrastructure_id>-rg/providers/Microsoft.Compute/images/<infrastructure_id> <6>
87+
resourceID: /resourceGroups/<infrastructure_id>-rg/providers/Microsoft.Compute/images/<infrastructure_id> <5>
8888
sku: ""
8989
version: ""
9090
internalLoadBalancer: ""
9191
kind: AzureMachineProviderSpec
92-
location: <region> <7>
92+
location: <region> <6>
9393
managedIdentity: <infrastructure_id>-identity <1>
9494
metadata:
9595
creationTimestamp: null
@@ -106,16 +106,16 @@ endif::infra[]
106106
sshPrivateKey: ""
107107
sshPublicKey: ""
108108
tags:
109-
- name: <custom_tag_name> <9>
110-
value: <custom_tag_value> <9>
109+
- name: <custom_tag_name> <8>
110+
value: <custom_tag_value> <8>
111111
subnet: <infrastructure_id>-<role>-subnet <1> <2>
112112
userDataSecret:
113113
name: worker-user-data <2>
114114
vmSize: Standard_D4s_v3
115115
vnet: <infrastructure_id>-vnet <1>
116-
zone: "1" <8>
116+
zone: "1" <7>
117117
ifdef::infra[]
118-
taints: <10>
118+
taints: <9>
119119
- key: node-role.kubernetes.io/infra
120120
effect: NoSchedule
121121
endif::infra[]
@@ -151,14 +151,13 @@ ifdef::infra[]
151151
<2> Specify the `<infra>` node label.
152152
<3> Specify the infrastructure ID, `<infra>` node label, and region.
153153
endif::infra[]
154-
<4> Optional: Specify the compute machine set name to enable the use of availability sets. This setting only applies to new compute machines.
155-
<5> Specify the image details for your compute machine set. If you want to use an Azure Marketplace image, see "Selecting an Azure Marketplace image".
156-
<6> Specify an image that is compatible with your instance type. The Hyper-V generation V2 images created by the installation program have a `-gen2` suffix, while V1 images have the same name without the suffix.
157-
<7> Specify the region to place machines on.
158-
<8> Specify the zone within your region to place machines on. Be sure that your region supports the zone that you specify.
159-
<9> Optional: Specify custom tags in your machine set. Provide the tag name in `<custom_tag_name>` field and the corresponding tag value in `<custom_tag_value>` field.
154+
<4> Specify the image details for your compute machine set. If you want to use an Azure Marketplace image, see "Selecting an Azure Marketplace image".
155+
<5> Specify an image that is compatible with your instance type. The Hyper-V generation V2 images created by the installation program have a `-gen2` suffix, while V1 images have the same name without the suffix.
156+
<6> Specify the region to place machines on.
157+
<7> Specify the zone within your region to place machines on. Be sure that your region supports the zone that you specify.
158+
<8> Optional: Specify custom tags in your machine set. Provide the tag name in `<custom_tag_name>` field and the corresponding tag value in `<custom_tag_value>` field.
160159
ifdef::infra[]
161-
<10> Specify a taint to prevent user workloads from being scheduled on infra nodes.
160+
<9> Specify a taint to prevent user workloads from being scheduled on infra nodes.
162161
+
163162
[NOTE]
164163
====

0 commit comments

Comments
 (0)