Skip to content

Commit 7008a7f

Browse files
authored
Merge pull request #89566 from jeana-redhat/misc-annotation-fix
fixing some mixed up annotations
2 parents 6013c48 + 7e08155 commit 7008a7f

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

modules/machineset-yaml-aws.adoc

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ endif::edge[]
121121
instanceType: m6i.large
122122
kind: AWSMachineProviderConfig
123123
placement:
124-
availabilityZone: <zone> <6>
125-
region: <region> <7>
124+
availabilityZone: <zone> <5>
125+
region: <region> <6>
126126
securityGroups:
127127
- filters:
128128
- name: tag:Name
@@ -137,16 +137,16 @@ ifndef::edge[]
137137
filters:
138138
- name: tag:Name
139139
values:
140-
- <infrastructure_id>-private-<zone> <8>
140+
- <infrastructure_id>-private-<zone> <7>
141141
endif::edge[]
142142
ifdef::edge[]
143-
id: <value_of_PublicSubnetIds> <8>
143+
id: <value_of_PublicSubnetIds> <7>
144144
publicIp: true
145145
endif::edge[]
146146
tags:
147147
- name: kubernetes.io/cluster/<infrastructure_id>
148148
value: owned
149-
- name: <custom_tag_name> <5>
149+
- name: <custom_tag_name> <8>
150150
value: <custom_tag_value>
151151
userDataSecret:
152152
name: worker-user-data
@@ -188,26 +188,25 @@ $ oc -n openshift-machine-api \
188188
-o jsonpath='{.spec.template.spec.providerSpec.value.ami.id}{"\n"}' \
189189
get machineset/<infrastructure_id>-<role>-<zone>
190190
----
191-
<5> Optional: Specify custom tag data for your cluster. For example, you might add an admin contact email address by specifying a `name:value` pair of `Email:\admin-email@example.com`.
192-
+
193-
[NOTE]
194-
====
195-
Custom tags can also be specified during installation in the `install-config.yml` file. If the `install-config.yml` file and the machine set include a tag with the same `name` data, the value for the tag from the machine set takes priority over the value for the tag in the `install-config.yml` file.
196-
====
197-
198191
ifndef::edge[]
199-
<6> Specify the zone, for example, `us-east-1a`.
192+
<5> Specify the zone name, for example, `us-east-1a`.
200193
endif::edge[]
201194
ifdef::edge[]
202-
<6> Specify the zone name, for example, `us-east-1-nyc-1a`.
203-
endif::edge[]
204-
<7> Specify the region, for example, `us-east-1`.
195+
<5> Specify the zone name, for example, `us-east-1-nyc-1a`.
196+
endif::edge[]
197+
<6> Specify the region, for example, `us-east-1`.
205198
ifndef::edge[]
206-
<8> Specify the infrastructure ID and zone.
199+
<7> Specify the infrastructure ID and zone.
207200
endif::edge[]
208201
ifdef::edge[]
209-
<8> The ID of the public subnet that you created in AWS {zone-type}. You created this public subnet ID when you finished the procedure for "Creating a subnet in an AWS zone".
202+
<7> The ID of the public subnet that you created in AWS {zone-type}. You created this public subnet ID when you finished the procedure for "Creating a subnet in an AWS zone".
210203
endif::edge[]
204+
<8> Optional: Specify custom tag data for your cluster. For example, you might add an admin contact email address by specifying a `name:value` pair of `Email:\admin-email@example.com`.
205+
+
206+
[NOTE]
207+
====
208+
Custom tags can also be specified during installation in the `install-config.yml` file. If the `install-config.yml` file and the machine set include a tag with the same `name` data, the value for the tag from the machine set takes priority over the value for the tag in the `install-config.yml` file.
209+
====
211210
ifdef::infra,edge[]
212211
<9> Specify a taint to prevent user workloads from being scheduled on
213212
ifdef::infra[`infra`]

0 commit comments

Comments
 (0)