Skip to content

Commit d8dcf11

Browse files
authored
Merge pull request #48165 from jeana-redhat/OSDOCS-3592-hypervgeneration-v2-azure
[OSDOCS-3592]: Note for Hyper-V gen2 images in machine set YAML
2 parents b48c1ca + d0107b9 commit d8dcf11

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

modules/machineset-yaml-azure.adoc

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ ifndef::infra[]
7474
endif::infra[]
7575
ifdef::infra[]
7676
node-role.kubernetes.io/infra: "" <2>
77-
taints: <5>
78-
- key: node-role.kubernetes.io/infra
79-
effect: NoSchedule
8077
endif::infra[]
8178
providerSpec:
8279
value:
@@ -87,17 +84,12 @@ endif::infra[]
8784
image:
8885
offer: ""
8986
publisher: ""
90-
resourceID: /resourceGroups/<infrastructure_id>-rg/providers/Microsoft.Compute/images/<infrastructure_id> <1>
87+
resourceID: /resourceGroups/<infrastructure_id>-rg/providers/Microsoft.Compute/images/<infrastructure_id> <5>
9188
sku: ""
9289
version: ""
9390
internalLoadBalancer: ""
9491
kind: AzureMachineProviderSpec
95-
ifndef::infra[]
96-
location: <region> <5>
97-
endif::infra[]
98-
ifdef::infra[]
9992
location: <region> <6>
100-
endif::infra[]
10193
managedIdentity: <infrastructure_id>-identity <1>
10294
metadata:
10395
creationTimestamp: null
@@ -118,11 +110,11 @@ endif::infra[]
118110
name: worker-user-data <2>
119111
vmSize: Standard_D4s_v3
120112
vnet: <infrastructure_id>-vnet <1>
121-
ifndef::infra[]
122-
zone: "1" <6>
123-
endif::infra[]
124-
ifdef::infra[]
125113
zone: "1" <7>
114+
ifdef::infra[]
115+
taints: <8>
116+
- key: node-role.kubernetes.io/infra
117+
effect: NoSchedule
126118
endif::infra[]
127119
----
128120
<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:
@@ -151,18 +143,17 @@ $ oc -n openshift-machine-api \
151143
ifndef::infra[]
152144
<2> Specify the node label to add.
153145
<3> Specify the infrastructure ID, node label, and region.
154-
<4> Optional: Specify the machine set name to enable the use of availability sets. This setting only applies to new compute machines.
155-
<5> Specify the region to place machines on.
156-
<6> Specify the zone within your region to place machines on. Be sure that your region supports the zone that you specify.
157146
endif::infra[]
158147
ifdef::infra[]
159148
<2> Specify the `<infra>` node label.
160149
<3> Specify the infrastructure ID, `<infra>` node label, and region.
150+
endif::infra[]
161151
<4> Optional: Specify the machine set name to enable the use of availability sets. This setting only applies to new compute machines.
162-
<5> Specify a taint to prevent user workloads from being scheduled on infra nodes.
152+
<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.
163153
<6> Specify the region to place machines on.
164154
<7> Specify the zone within your region to place machines on. Be sure that your region supports the zone that you specify.
165-
155+
ifdef::infra[]
156+
<8> Specify a taint to prevent user workloads from being scheduled on infra nodes.
166157
endif::infra[]
167158

168159

0 commit comments

Comments
 (0)