Skip to content

Commit 8bc5487

Browse files
authored
Merge pull request #91861 from EricPonvelle/numbering_fixes_hcp
Fixed numbering callouts within HCP
2 parents 9a0e997 + 30520a1 commit 8bc5487

7 files changed

+36
-34
lines changed

modules/consuming-huge-pages-resource-using-the-downward-api.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
requests:
4848
hugepages-1Gi: 2Gi
4949
env:
50-
- name: REQUESTS_HUGEPAGES_1GI <.>
50+
- name: REQUESTS_HUGEPAGES_1GI \ <1>
5151
valueFrom:
5252
resourceFieldRef:
5353
containerName: example
@@ -59,14 +59,14 @@ spec:
5959
- name: podinfo
6060
downwardAPI:
6161
items:
62-
- path: "hugepages_1G_request" <.>
62+
- path: "hugepages_1G_request" \ <2>
6363
resourceFieldRef:
6464
containerName: example
6565
resource: requests.hugepages-1Gi
6666
divisor: 1Gi
6767
----
68-
<.> Specifies to read the resource use from `requests.hugepages-1Gi` and expose the value as the `REQUESTS_HUGEPAGES_1GI` environment variable.
69-
<.> Specifies to read the resource use from `requests.hugepages-1Gi` and expose the value as the file `/etc/podinfo/hugepages_1G_request`.
68+
<1> Specifies to read the resource use from `requests.hugepages-1Gi` and expose the value as the `REQUESTS_HUGEPAGES_1GI` environment variable.
69+
<2> Specifies to read the resource use from `requests.hugepages-1Gi` and expose the value as the file `/etc/podinfo/hugepages_1G_request`.
7070

7171
. Create the pod from the `{file-name}` file:
7272
+

modules/network-observability-virtualization-configuration.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,19 @@ metadata:
6767
spec:
6868
agent:
6969
ebpf:
70-
privileged: true <1>
70+
privileged: true \ <1>
7171
processor:
7272
advanced:
7373
secondaryNetworks:
74-
- index: <2>
75-
- MAC <3>
76-
name: my-vms/l2-network <4>
74+
- index: \ <2>
75+
- MAC \ <3>
76+
name: my-vms/l2-network \ <4>
7777
# ...
7878
----
79-
<.> Ensure that the eBPF agent is in `privileged` mode so that flows are collected for secondary interfaces.
80-
<.> Define the fields to use for indexing the virtual machine launcher pods. It is recommended to use the `MAC` address as the indexing field to get network flows enrichment for secondary interfaces. If you have overlapping MAC address between pods, then additional indexing fields, such as `IP` and `Interface`, could be added to have accurate enrichment.
81-
<.> If your additional network information has a MAC address, add `MAC` to the field list.
82-
<.> Specify the name of the network found in the `k8s.v1.cni.cncf.io/network-status` annotation. Usually <namespace>/<network_attachement_definition_name>.
79+
<1> Ensure that the eBPF agent is in `privileged` mode so that flows are collected for secondary interfaces.
80+
<2> Define the fields to use for indexing the virtual machine launcher pods. It is recommended to use the `MAC` address as the indexing field to get network flows enrichment for secondary interfaces. If you have overlapping MAC address between pods, then additional indexing fields, such as `IP` and `Interface`, could be added to have accurate enrichment.
81+
<3> If your additional network information has a MAC address, add `MAC` to the field list.
82+
<4> Specify the name of the network found in the `k8s.v1.cni.cncf.io/network-status` annotation. Usually <namespace>/<network_attachement_definition_name>.
8383

8484
. Observe VM traffic:
8585
.. Navigate to the *Network Traffic* page.

modules/rosa-classic-cluster-terraform-file-creation.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ module "rosa-classic" {
101101
multi_az = var.multi_az
102102
create_account_roles = true
103103
create_operator_roles = true
104-
# Optional: Configure a cluster administrator user <.>
104+
# Optional: Configure a cluster administrator user \ <1>
105105
#
106106
# Option 1: Default cluster-admin user
107107
# Create an administrator user (cluster-admin) and automatically
@@ -119,7 +119,7 @@ module "rosa-classic" {
119119
}
120120
EOF
121121
----
122-
<.> Optional: Create an administrator user during cluster creation by uncommenting the appropriate parameters and editing their values.
122+
<1> Optional: Create an administrator user during cluster creation by uncommenting the appropriate parameters and editing their values.
123123

124124
. Create the `variables.tf` file by running the following command:
125125
+

modules/rosa-hcp-aws-private-security-groups.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ $ export SG_ID=$(aws ec2 create-security-group --description "Granting API acces
6464
+
6565
[source,terminal]
6666
----
67-
$ aws ec2 authorize-security-group-ingress --group-id $SG_ID --ip-permissions FromPort=443,ToPort=443,IpProtocol=tcp,IpRanges=[{CidrIp=<cidr-to-allow>}] <.>
67+
$ aws ec2 authorize-security-group-ingress --group-id $SG_ID --ip-permissions FromPort=443,ToPort=443,IpProtocol=tcp,IpRanges=[{CidrIp=<cidr-to-allow>}] \ <1>
6868
----
69-
<.> Specify the CIDR block you want to allow access from.
69+
<1> Specify the CIDR block you want to allow access from.
7070

7171
. Add the new security group to the VPCE by running the following command:
7272
+

modules/rosa-hcp-cluster-terraform-file-creation.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ module "rosa-hcp" {
9797
aws_subnet_ids = var.create_vpc ? var.private_cluster ? module.vpc[0].private_subnets : concat(module.vpc[0].public_subnets, module.vpc[0].private_subnets) : var.aws_subnet_ids
9898
create_account_roles = true
9999
create_operator_roles = true
100-
# Optional: Configure a cluster administrator user <.>
100+
# Optional: Configure a cluster administrator user \ <1>
101101
#
102102
# Option 1: Default cluster-admin user
103103
# Create an administrator user (cluster-admin) and automatically
@@ -115,7 +115,7 @@ module "rosa-hcp" {
115115
}
116116
EOF
117117
----
118-
<.> Optional: Create an administrator user during cluster creation by uncommenting the appropriate parameters and editing their values if required.
118+
<1> Optional: Create an administrator user during cluster creation by uncommenting the appropriate parameters and editing their values if required.
119119

120120
. Create the `variables.tf` file by running the following command:
121121
+

modules/rosa-hcp-sts-creating-a-cluster-cli.adoc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,24 @@ When creating a {hcp-title} cluster, the default machine Classless Inter-Domain
4040
[source,terminal]
4141
----
4242
$ rosa create cluster --cluster-name=<cluster_name> \ <1>
43-
--mode=auto --hosted-cp [--private] \ <2>
43+
--mode=auto --hosted-cp [--private] \ <2>
4444
--operator-roles-prefix <operator-role-prefix> \ <3>
4545
--external-id <external-id> \ <4>
4646
--oidc-config-id <id-of-oidc-configuration> \
4747
--subnet-ids=<public-subnet-id>,<private-subnet-id>
4848
----
4949
+
5050
--
51-
<.> Specify the name of your cluster. If your cluster name is longer than 15 characters, it will contain an autogenerated domain prefix as a subdomain for your provisioned cluster on openshiftapps.com. To customize the subdomain, use the `--domain-prefix` flag. The domain prefix cannot be longer than 15 characters, must be unique, and cannot be changed after cluster creation.
52-
<.> Optional: The `--private` argument is used to create private {hcp-title} clusters. If you use this argument, ensure that you only use your private subnet ID for `--subnet-ids`.
53-
<.> By default, the cluster-specific Operator role names are prefixed with the cluster name and a random 4-digit hash. You can optionally specify a custom prefix to replace `<cluster_name>-<hash>` in the role names. The prefix is applied when you create the cluster-specific Operator IAM roles. For information about the prefix, see _About custom Operator IAM role prefixes_.
51+
<1> Specify the name of your cluster. If your cluster name is longer than 15 characters, it will contain an autogenerated domain prefix as a subdomain for your provisioned cluster on openshiftapps.com. To customize the subdomain, use the `--domain-prefix` flag. The domain prefix cannot be longer than 15 characters, must be unique, and cannot be changed after cluster creation.
52+
<2> Optional: The `--private` argument is used to create private {hcp-title} clusters. If you use this argument, ensure that you only use your private subnet ID for `--subnet-ids`.
53+
<3> By default, the cluster-specific Operator role names are prefixed with the cluster name and a random 4-digit hash. You can optionally specify a custom prefix to replace `<cluster_name>-<hash>` in the role names. The prefix is applied when you create the cluster-specific Operator IAM roles. For information about the prefix, see _About custom Operator IAM role prefixes_.
5454
+
5555
[NOTE]
5656
====
5757
If you specified custom ARN paths when you created the associated account-wide roles, the custom path is automatically detected. The custom path is applied to the cluster-specific Operator roles when you create them in a later step.
5858
====
59-
<.> Optional: A unique identifier that might be required when you assume a role in another account.
59+
60+
<4> Optional: A unique identifier that might be required when you assume a role in another account.
6061
--
6162

6263
* If you set the environmental variables, create a cluster with a single, initial machine pool, using either a publicly or privately available API, and a publicly or privately available Ingress by running the following command:
@@ -100,6 +101,6 @@ If the installation fails or the `State` field does not change to `ready` after
100101
+
101102
[source,terminal]
102103
----
103-
$ rosa logs install --cluster=<cluster_name> --watch \ <.>
104+
$ rosa logs install --cluster=<cluster_name> --watch \ <1>
104105
----
105-
<.> Optional: To watch for new log messages as the installation progresses, use the `--watch` argument.
106+
<1> Optional: To watch for new log messages as the installation progresses, use the `--watch` argument.

modules/rosa-hcp-sts-creating-a-cluster-egress-lockdown-cli.adoc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,27 @@ When creating a {hcp-title} cluster, the default machine Classless Inter-Domain
3131
+
3232
[source,terminal]
3333
----
34-
$ rosa create cluster --cluster-name=<cluster_name> \ <.>
35-
--mode=auto --hosted-cp [--private] \ <.>
36-
--operator-roles-prefix <operator-role-prefix> \ <.>
34+
$ rosa create cluster --cluster-name=<cluster_name> \ <1>
35+
--mode=auto --hosted-cp [--private] \
36+
--operator-roles-prefix <operator-role-prefix> \ <2>
3737
--oidc-config-id <id-of-oidc-configuration> \
3838
--subnet-ids=<private-subnet-id> --region <region> \
3939
--machine-cidr 10.0.0.0/16 --service-cidr 172.30.0.0/16 \
4040
--pod-cidr 10.128.0.0/14 --host-prefix 23 \
41-
--billing-account <root-acct-id> \ <.>
41+
--billing-account <root-acct-id> \ <3>
4242
--properties zero_egress:true
4343
----
4444
+
4545
--
46-
<.> Specify the name of your cluster. If your cluster name is longer than 15 characters, it will contain an autogenerated domain prefix as a subdomain for your provisioned cluster on openshiftapps.com. To customize the subdomain, use the `--domain-prefix` flag. The domain prefix cannot be longer than 15 characters, must be unique, and cannot be changed after cluster creation.
47-
<.> By default, the cluster-specific Operator role names are prefixed with the cluster name and a random 4-digit hash. You can optionally specify a custom prefix to replace `<cluster_name>-<hash>` in the role names. The prefix is applied when you create the cluster-specific Operator IAM roles. For information about the prefix, see _About custom Operator IAM role prefixes_.
46+
<1> Specify the name of your cluster. If your cluster name is longer than 15 characters, it will contain an autogenerated domain prefix as a subdomain for your provisioned cluster on openshiftapps.com. To customize the subdomain, use the `--domain-prefix` flag. The domain prefix cannot be longer than 15 characters, must be unique, and cannot be changed after cluster creation.
47+
<2> By default, the cluster-specific Operator role names are prefixed with the cluster name and a random 4-digit hash. You can optionally specify a custom prefix to replace `<cluster_name>-<hash>` in the role names. The prefix is applied when you create the cluster-specific Operator IAM roles. For information about the prefix, see _About custom Operator IAM role prefixes_.
4848
+
4949
[NOTE]
5050
====
5151
If you specified custom ARN paths when you created the associated account-wide roles, the custom path is automatically detected. The custom path is applied to the cluster-specific Operator roles when you create them in a later step.
5252
====
53-
<.> Provide the AWS account that is responsible for all billing.
53+
54+
<3> Provide the AWS account that is responsible for all billing.
5455
--
5556

5657
* If you set the environment variables, create a cluster with egress lockdown that has a single, initial machine pool, using a privately available API, and a privately available Ingress by running the following command:
@@ -88,6 +89,6 @@ If the installation fails or the `State` field does not change to `ready` after
8889
+
8990
[source,terminal]
9091
----
91-
$ rosa logs install --cluster=<cluster_name> --watch \ <.>
92+
$ rosa logs install --cluster=<cluster_name> --watch \ <1>
9293
----
93-
<.> Optional: To watch for new log messages as the installation progresses, use the `--watch` argument.
94+
<1> Optional: To watch for new log messages as the installation progresses, use the `--watch` argument.

0 commit comments

Comments
 (0)