Skip to content

Commit db91b96

Browse files
committed
OCPBUGS-37110: fix security group tag in MAPI docs
1 parent 7991879 commit db91b96

File tree

1 file changed

+21
-17
lines changed

1 file changed

+21
-17
lines changed

modules/machineset-yaml-aws.adoc

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,49 +59,49 @@ spec:
5959
replicas: 1
6060
selector:
6161
matchLabels:
62-
machine.openshift.io/cluster-api-cluster: <infrastructure_id> <1>
62+
machine.openshift.io/cluster-api-cluster: <infrastructure_id>
6363
ifdef::edge[]
6464
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-edge-<zone>
6565
endif::edge[]
6666
ifndef::infra,edge[]
67-
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-<role>-<zone> <2>
67+
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-<role>-<zone>
6868
endif::infra,edge[]
6969
ifdef::infra[]
70-
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-infra-<zone> <2>
70+
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-infra-<zone>
7171
endif::infra[]
7272
template:
7373
metadata:
7474
labels:
75-
machine.openshift.io/cluster-api-cluster: <infrastructure_id> <1>
75+
machine.openshift.io/cluster-api-cluster: <infrastructure_id>
7676
ifndef::infra,edge[]
7777
machine.openshift.io/cluster-api-machine-role: <role> <3>
78-
machine.openshift.io/cluster-api-machine-type: <role> <3>
79-
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-<role>-<zone> <2>
78+
machine.openshift.io/cluster-api-machine-type: <role>
79+
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-<role>-<zone>
8080
endif::infra,edge[]
8181
ifdef::infra[]
8282
machine.openshift.io/cluster-api-machine-role: infra <3>
83-
machine.openshift.io/cluster-api-machine-type: infra <3>
84-
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-infra-<zone> <2>
83+
machine.openshift.io/cluster-api-machine-type: infra
84+
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-infra-<zone>
8585
endif::infra[]
8686
ifdef::edge[]
8787
machine.openshift.io/cluster-api-machine-role: edge <3>
88-
machine.openshift.io/cluster-api-machine-type: edge <3>
89-
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-edge-<zone> <2>
88+
machine.openshift.io/cluster-api-machine-type: edge
89+
machine.openshift.io/cluster-api-machineset: <infrastructure_id>-edge-<zone>
9090
endif::edge[]
9191
spec:
9292
metadata:
9393
labels:
9494
ifndef::infra,edge[]
95-
node-role.kubernetes.io/<role>: "" <3>
95+
node-role.kubernetes.io/<role>: ""
9696
endif::infra,edge[]
9797
ifdef::infra[]
98-
node-role.kubernetes.io/infra: "" <3>
98+
node-role.kubernetes.io/infra: ""
9999
endif::infra[]
100100
ifdef::edge[]
101101
machine.openshift.io/parent-zone-name: <value_of_ParentZoneName>
102102
machine.openshift.io/zone-group: <value_of_GroupName>
103103
machine.openshift.io/zone-type: <value_of_ZoneType>
104-
node-role.kubernetes.io/edge: "" <3>
104+
node-role.kubernetes.io/edge: ""
105105
endif::edge[]
106106
providerSpec:
107107
value:
@@ -117,7 +117,7 @@ endif::edge[]
117117
name: aws-cloud-credentials
118118
deviceIndex: 0
119119
iamInstanceProfile:
120-
id: <infrastructure_id>-worker-profile <1>
120+
id: <infrastructure_id>-worker-profile
121121
instanceType: m6i.large
122122
kind: AWSMachineProviderConfig
123123
placement:
@@ -127,7 +127,11 @@ endif::edge[]
127127
- filters:
128128
- name: tag:Name
129129
values:
130-
- <infrastructure_id>-worker-sg <1>
130+
- <infrastructure_id>-node
131+
- filters:
132+
- name: tag:Name
133+
values:
134+
- <infrastructure_id>-lb
131135
subnet:
132136
ifndef::edge[]
133137
filters:
@@ -140,10 +144,10 @@ ifdef::edge[]
140144
publicIp: true
141145
endif::edge[]
142146
tags:
143-
- name: kubernetes.io/cluster/<infrastructure_id> <1>
147+
- name: kubernetes.io/cluster/<infrastructure_id>
144148
value: owned
145149
- name: <custom_tag_name> <5>
146-
value: <custom_tag_value> <5>
150+
value: <custom_tag_value>
147151
userDataSecret:
148152
name: worker-user-data
149153
ifdef::infra,edge[]

0 commit comments

Comments
 (0)