Skip to content

Commit 1a6b20b

Browse files
committed
OSDOCS-16195 removing discrete tags from ROSA and OSD
1 parent b4e9302 commit 1a6b20b

26 files changed

+76
-129
lines changed

cloud_experts_tutorials/cloud-experts-aws-secret-manager.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Ensure that you have the following resources and tools before starting this proc
3030
* `oc` CLI
3131
* `jq` CLI
3232

33-
[discrete]
3433
[id="cloud-experts-aws-secret-manager-preparing-environment"]
3534
=== Additional environment requirements
3635

@@ -59,7 +58,7 @@ $ oc get authentication.config.openshift.io cluster -o json \
5958
----
6059
+
6160
If your output is different, do not proceed.
62-
See
61+
See
6362
ifndef::openshift-rosa-hcp[]
6463
xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[Red{nbsp}Hat documentation on creating an STS cluster] before continuing this process.
6564
endif::openshift-rosa-hcp[]

cloud_experts_tutorials/cloud-experts-deploying-application/cloud-experts-deploying-application-prerequisites.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endif::openshift-rosa[]
2222

2323
. The OpenShift Command Line Interface (CLI)
2424
+
25-
For more information, see
25+
For more information, see
2626
ifdef::openshift-rosa-hcp[]
2727
link:https://docs.openshift.com/rosa/cli_reference/openshift_cli/getting-started-cli.html#cli-getting-started[Getting started with the OpenShift CLI].
2828
endif::openshift-rosa-hcp[]
@@ -35,5 +35,5 @@ endif::openshift-rosa-hcp[]
3535
Use your existing GitHub account or register at link:https://github.com/signup[https://github.com/signup].
3636

3737
include::modules/rosa-sts-understanding-aws-account-association.adoc[leveloffset=+2]
38-
[discrete]
39-
include::modules/rosa-sts-associating-your-aws-account.adoc[leveloffset=+2]
38+
39+
include::modules/rosa-sts-associating-your-aws-account.adoc[leveloffset=+2]

modules/rosa-hcp-create-network.adoc

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ If you do not specify a template, CloudFormation uses a default template that cr
2424
| Availability zones
2525
| 1
2626

27-
| Region
27+
| Region
2828
| `us-east-1`
29-
30-
| VPC CIDR
31-
| `10.0.0.0/16`
29+
30+
| VPC CIDR
31+
| `10.0.0.0/16`
3232
|===
3333

3434
You can create and customize CloudFormation templates to use with the `rosa create network` command. See the additional resources of this section for information on the default VPC template.
@@ -339,25 +339,25 @@ endif::rosa-egress-lockdown[]
339339
+
340340
[source,bash]
341341
----
342-
INFO[0140] Resources created in stack:
343-
INFO[0140] Resource: AttachGateway, Type: AWS::EC2::VPCGatewayAttachment, ID: <gateway_id>
344-
INFO[0140] Resource: EC2VPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
342+
INFO[0140] Resources created in stack:
343+
INFO[0140] Resource: AttachGateway, Type: AWS::EC2::VPCGatewayAttachment, ID: <gateway_id>
344+
INFO[0140] Resource: EC2VPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
345345
INFO[0140] Resource: EcrApiVPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
346-
INFO[0140] Resource: EcrDkrVPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
346+
INFO[0140] Resource: EcrDkrVPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
347347
INFO[0140] Resource: ElasticIP1, Type: AWS::EC2::EIP, ID: <IP>
348-
INFO[0140] Resource: ElasticIP2, Type: AWS::EC2::EIP, ID: <IP>
349-
INFO[0140] Resource: InternetGateway, Type: AWS::EC2::InternetGateway, ID: igw-016e1a71b9812464e
350-
INFO[0140] Resource: KMSVPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
351-
INFO[0140] Resource: NATGateway1, Type: AWS::EC2::NatGateway, ID: <nat-gateway_id>
352-
INFO[0140] Resource: PrivateRoute, Type: AWS::EC2::Route, ID: <route_id>
353-
INFO[0140] Resource: PrivateRouteTable, Type: AWS::EC2::RouteTable, ID: <route_id>
348+
INFO[0140] Resource: ElasticIP2, Type: AWS::EC2::EIP, ID: <IP>
349+
INFO[0140] Resource: InternetGateway, Type: AWS::EC2::InternetGateway, ID: igw-016e1a71b9812464e
350+
INFO[0140] Resource: KMSVPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
351+
INFO[0140] Resource: NATGateway1, Type: AWS::EC2::NatGateway, ID: <nat-gateway_id>
352+
INFO[0140] Resource: PrivateRoute, Type: AWS::EC2::Route, ID: <route_id>
353+
INFO[0140] Resource: PrivateRouteTable, Type: AWS::EC2::RouteTable, ID: <route_id>
354354
INFO[0140] Resource: PrivateSubnetRouteTableAssociation1, Type: AWS::EC2::SubnetRouteTableAssociation, ID: <route_id>
355-
INFO[0140] Resource: PublicRoute, Type: AWS::EC2::Route, ID: <route_id>
356-
INFO[0140] Resource: PublicRouteTable, Type: AWS::EC2::RouteTable, ID: <route_id>
357-
INFO[0140] Resource: PublicSubnetRouteTableAssociation1, Type: AWS::EC2::SubnetRouteTableAssociation, ID: <route_id>
358-
INFO[0140] Resource: S3VPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
359-
INFO[0140] Resource: STSVPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
360-
INFO[0140] Resource: SecurityGroup, Type: AWS::EC2::SecurityGroup, ID: <security-group_id>
355+
INFO[0140] Resource: PublicRoute, Type: AWS::EC2::Route, ID: <route_id>
356+
INFO[0140] Resource: PublicRouteTable, Type: AWS::EC2::RouteTable, ID: <route_id>
357+
INFO[0140] Resource: PublicSubnetRouteTableAssociation1, Type: AWS::EC2::SubnetRouteTableAssociation, ID: <route_id>
358+
INFO[0140] Resource: S3VPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
359+
INFO[0140] Resource: STSVPCEndpoint, Type: AWS::EC2::VPCEndpoint, ID: <vpce_id>
360+
INFO[0140] Resource: SecurityGroup, Type: AWS::EC2::SecurityGroup, ID: <security-group_id>
361361
INFO[0140] Resource: SubnetPrivate1, Type: AWS::EC2::Subnet, ID: <private_subnet_id-1> \ <1>
362362
INFO[0140] Resource: SubnetPublic1, Type: AWS::EC2::Subnet, ID: <public_subnet_id-1> \ <1>
363363
INFO[0140] Resource: VPC, Type: AWS::EC2::VPC, ID: <vpc_id>
@@ -367,7 +367,6 @@ INFO[0140] Stack rosa-network-stack-5555 created \ <2>
367367
<2> The network stack name is used to delete the resource later.
368368
369369
ifdef::rosa-egress-lockdown[]
370-
[discrete]
371370
[id="rosa-hcp-vpc-subnet-tagging-rosa-network_{context}"]
372371
== Tagging your subnets
373372

@@ -380,11 +379,11 @@ Before you can use your VPC to create a {product-title} cluster, you must tag yo
380379
| Value
381380

382381
| Public subnet
383-
| `kubernetes.io/role/elb`
382+
| `kubernetes.io/role/elb`
384383
| `1` or no value
385384

386-
| Private subnet
387-
| `kubernetes.io/role/internal-elb`
385+
| Private subnet
386+
| `kubernetes.io/role/internal-elb`
388387
| `1` or no value
389388

390389
|===

modules/rosa-hcp-vpc-manual.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ If you choose to manually create your AWS Virtual Private Cloud (VPC) instead of
1818
include::snippets/rosa-existing-vpc-requirements.adoc[leveloffset=+0]
1919

2020
ifdef::rosa-egress-lockdown[]
21-
[discrete]
2221
[id="rosa-hcp-vpc-subnet-tagging-manual_{context}"]
2322
== Tagging your subnets
2423

@@ -31,11 +30,11 @@ Before you can use your VPC to create a {product-title} cluster, you must tag yo
3130
| Value
3231

3332
| Public subnet
34-
| `kubernetes.io/role/elb`
33+
| `kubernetes.io/role/elb`
3534
| `1` or no value
3635

37-
| Private subnet
38-
| `kubernetes.io/role/internal-elb`
36+
| Private subnet
37+
| `kubernetes.io/role/internal-elb`
3938
| `1` or no value
4039

4140
|===

modules/rosa-hcp-vpc-terraform.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ $ subnet-0a6a57e0f784171aa,subnet-078e84e5b10ecf5b0
126126

127127
endif::rosa-egress-lockdown[]
128128
ifdef::rosa-egress-lockdown[]
129-
[discrete]
130129
[id="rosa-hcp-vpc-subnet-tagging-terraform_{context}"]
131130
== Tagging your subnets
132131

@@ -139,11 +138,11 @@ Before you can use your VPC to create a {product-title} cluster, you must tag yo
139138
| Value
140139

141140
| Public subnet
142-
| `kubernetes.io/role/elb`
141+
| `kubernetes.io/role/elb`
143142
| `1` or no value
144143

145-
| Private subnet
146-
| `kubernetes.io/role/internal-elb`
144+
| Private subnet
145+
| `kubernetes.io/role/internal-elb`
147146
| `1` or no value
148147

149148
|===

modules/rosa-sts-account-wide-role-and-policy-commands.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
This section lists the `aws` CLI commands that the `rosa` command generates in the terminal. You can run the command in either manual or automatic mode.
99

10-
[discrete]
1110
[id="rosa-sts-account-wide-role-and-policy-aws-cli-manual-mode_{context}"]
1211
== Using manual mode for account role creation
1312

@@ -92,7 +91,6 @@ aws iam create-policy \
9291
--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-image-registry Key=operator_name,Value=installer-cloud-credentials
9392
----
9493

95-
[discrete]
9694
[id="rosa-sts-account-wide-role-and-policy-aws-cli-auto-mode_{context}"]
9795
== Using auto mode for role creation
9896

modules/rosa-sts-account-wide-roles-and-policies.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ The account-wide roles and policies are specific to an {product-title} minor rel
1414

1515
You can create account-wide roles by using the {product-title} (ROSA) CLI, `rosa`, or the {cluster-manager-url} guided installation. You can create the roles manually or by using an automatic process that uses predefined names for these roles and policies.
1616

17-
[discrete]
1817
[id="rosa-sts-account-wide-roles-and-policies-creation-methods-manual_{context}"]
1918
=== Manual ocm-role resource creation
2019

2120
You can use the manual creation method if you have the necessary CLI access to create these roles on your system. You can run this option in your desired CLI tool or from {cluster-manager}. After you start the manual creation process, the CLI presents a series of commands for you to run that create the roles and link them to the needed policies.
2221

23-
[discrete]
2422
[id="rosa-sts-account-wide-roles-and-policies-creation-methods-auto_{context}"]
2523
=== Automatic ocm-role resource creation
2624

@@ -204,7 +202,6 @@ include::https://raw.githubusercontent.com/openshift/managed-cluster-config/refs
204202
----
205203
====
206204

207-
[discrete]
208205
[id="rosa-sts-account-wide-roles-and-policies-example-cli-output-for-policies-attached-to-a-role_{context}"]
209206
==== Example CLI output for policies attached to a role
210207

modules/rosa-sts-byo-oidc-options.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ The following options may be added to the `rosa create oidc-config` command. All
1414
You are required to register the unmanaged OIDC configuration by posting a request to `/oidc_configs` through OpenShift Cluster Manager. You receive an ID in the response. Use this ID to create a cluster.
1515
====
1616

17-
[discrete]
1817
[id="rosa-sts-byo-oidc-raw-files_{context}"]
1918
== raw-files
2019

@@ -28,7 +27,6 @@ You use these files to set up the endpoint. This endpoint responds to `/.well-kn
2827
$ rosa create oidc-config --raw-files
2928
----
3029

31-
[discrete]
3230
[id="rosa-sts-byo-oidc-mode_{context}"]
3331
== mode
3432

@@ -42,7 +40,6 @@ You receive the same OIDC configuration and AWS resources as the `manual` mode w
4240
$ rosa create oidc-config --mode=<auto|manual>
4341
----
4442

45-
[discrete]
4643
[id="rosa-sts-byo-oidc-managed_{context}"]
4744
== managed
4845

osd_cluster_admin/osd_nodes/osd-nodes-about-autoscaling-nodes.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
include::_attributes/attributes-openshift-dedicated.adoc[]
32
[id="osd-nodes-about-autoscaling-nodes"]
43
= About autoscaling nodes on a cluster
4+
include::_attributes/attributes-openshift-dedicated.adoc[]
55
:context: osd-nodes-about-autoscaling-nodes
6+
67
toc::[]
78

89
[IMPORTANT]
@@ -28,7 +29,6 @@ Only cluster owners and organization admins can scale or delete a cluster.
2829

2930
You can enable autoscaling on worker nodes to increase or decrease the number of nodes available by editing the machine pool definition for an existing cluster.
3031

31-
[discrete]
3232
include::modules/ocm-enabling-autoscaling-nodes.adoc[leveloffset=+2]
3333

3434
[id="osd-nodes-disabling-autoscaling-nodes"]
@@ -38,7 +38,6 @@ You can disable autoscaling on worker nodes to increase or decrease the number o
3838

3939
You can disable autoscaling on a cluster using {cluster-manager} console.
4040

41-
[discrete]
4241
include::modules/ocm-disabling-autoscaling-nodes.adoc[leveloffset=+2]
4342

4443
Applying autoscaling to an {product-title} cluster involves deploying a cluster autoscaler and then deploying machine autoscalers for each machine type in your cluster.

rosa_architecture/rosa-oidc-overview.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ The OIDC protocol uses a configuration URL that contains the necessary informati
1515
include::modules/rosa-oidc-understanding.adoc[leveloffset=+1]
1616

1717
include::modules/rosa-oidc-config-overview.adoc[leveloffset=+1]
18-
[discrete]
19-
include::modules/rosa-sts-byo-oidc.adoc[leveloffset=+3]
20-
[discrete]
21-
include::modules/rosa-sts-byo-oidc-options.adoc[leveloffset=+3]
18+
19+
include::modules/rosa-sts-byo-oidc.adoc[leveloffset=+2]
20+
21+
include::modules/rosa-sts-byo-oidc-options.adoc[leveloffset=+2]
2222

2323
include::modules/rosa-sts-oidc-provider-command.adoc[leveloffset=+1]
2424

0 commit comments

Comments
 (0)