From e961ecb853ac156ee6542217feba10fe50c2832c Mon Sep 17 00:00:00 2001 From: Jeana Routh Date: Thu, 9 Jan 2025 16:01:04 -0500 Subject: [PATCH] OCPBUGS-37110: fix security group tag in MAPI docs --- modules/machineset-yaml-aws.adoc | 38 ++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/modules/machineset-yaml-aws.adoc b/modules/machineset-yaml-aws.adoc index dbc6bb7238..de42c81d8c 100644 --- a/modules/machineset-yaml-aws.adoc +++ b/modules/machineset-yaml-aws.adoc @@ -59,49 +59,49 @@ spec: replicas: 1 selector: matchLabels: - machine.openshift.io/cluster-api-cluster: <1> + machine.openshift.io/cluster-api-cluster: ifdef::edge[] machine.openshift.io/cluster-api-machineset: -edge- endif::edge[] ifndef::infra,edge[] - machine.openshift.io/cluster-api-machineset: -- <2> + machine.openshift.io/cluster-api-machineset: -- endif::infra,edge[] ifdef::infra[] - machine.openshift.io/cluster-api-machineset: -infra- <2> + machine.openshift.io/cluster-api-machineset: -infra- endif::infra[] template: metadata: labels: - machine.openshift.io/cluster-api-cluster: <1> + machine.openshift.io/cluster-api-cluster: ifndef::infra,edge[] machine.openshift.io/cluster-api-machine-role: <3> - machine.openshift.io/cluster-api-machine-type: <3> - machine.openshift.io/cluster-api-machineset: -- <2> + machine.openshift.io/cluster-api-machine-type: + machine.openshift.io/cluster-api-machineset: -- endif::infra,edge[] ifdef::infra[] machine.openshift.io/cluster-api-machine-role: infra <3> - machine.openshift.io/cluster-api-machine-type: infra <3> - machine.openshift.io/cluster-api-machineset: -infra- <2> + machine.openshift.io/cluster-api-machine-type: infra + machine.openshift.io/cluster-api-machineset: -infra- endif::infra[] ifdef::edge[] machine.openshift.io/cluster-api-machine-role: edge <3> - machine.openshift.io/cluster-api-machine-type: edge <3> - machine.openshift.io/cluster-api-machineset: -edge- <2> + machine.openshift.io/cluster-api-machine-type: edge + machine.openshift.io/cluster-api-machineset: -edge- endif::edge[] spec: metadata: labels: ifndef::infra,edge[] - node-role.kubernetes.io/: "" <3> + node-role.kubernetes.io/: "" endif::infra,edge[] ifdef::infra[] - node-role.kubernetes.io/infra: "" <3> + node-role.kubernetes.io/infra: "" endif::infra[] ifdef::edge[] machine.openshift.io/parent-zone-name: machine.openshift.io/zone-group: machine.openshift.io/zone-type: - node-role.kubernetes.io/edge: "" <3> + node-role.kubernetes.io/edge: "" endif::edge[] providerSpec: value: @@ -117,7 +117,7 @@ endif::edge[] name: aws-cloud-credentials deviceIndex: 0 iamInstanceProfile: - id: -worker-profile <1> + id: -worker-profile instanceType: m6i.large kind: AWSMachineProviderConfig placement: @@ -127,7 +127,11 @@ endif::edge[] - filters: - name: tag:Name values: - - -worker-sg <1> + - -node + - filters: + - name: tag:Name + values: + - -lb subnet: ifndef::edge[] filters: @@ -140,10 +144,10 @@ ifdef::edge[] publicIp: true endif::edge[] tags: - - name: kubernetes.io/cluster/ <1> + - name: kubernetes.io/cluster/ value: owned - name: <5> - value: <5> + value: userDataSecret: name: worker-user-data ifdef::infra,edge[]