Skip to content

Commit 4567ce3

Browse files
authored
Merge pull request #112756 from stevsmit/16994-OSDOCS-1
[OSDOCS-16994] Addresses Azure IPI CQA errors
2 parents 2b8fb0d + 4013fc2 commit 4567ce3

3 files changed

Lines changed: 62 additions & 50 deletions

File tree

modules/cco-ccoctl-configuring.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ endif::[]
124124
ifndef::update[= Configuring the Cloud Credential Operator utility]
125125
ifdef::update[= Configuring the Cloud Credential Operator utility for a cluster update]
126126

127+
[role="_abstract"]
127128
//Nutanix-only intro because it needs context in its install procedure.
128129
ifdef::nutanix[]
129130
The Cloud Credential Operator (CCO) manages cloud provider credentials as Kubernetes custom resource definitions (CRDs). To install a cluster on Nutanix, you must set the CCO to `manual` mode as part of the installation process.
@@ -200,10 +201,11 @@ Ensure that the architecture of the `$RELEASE_IMAGE` matches the architecture of
200201
[source,terminal]
201202
----
202203
$ oc image extract $CCO_IMAGE \
203-
--file="/usr/bin/ccoctl.<rhel_version>" \// <1>
204+
--file="/usr/bin/ccoctl.<rhel_version>" \
204205
-a ~/.pull-secret
205206
----
206-
<1> For `<rhel_version>`, specify the value that corresponds to the version of {op-system-base-full} that the host uses.
207+
+
208+
For `<rhel_version>`, specify the value that corresponds to the version of {op-system-base-full} that the host uses.
207209
If no value is specified, `ccoctl.rhel8` is used by default.
208210
The following values are valid:
209211
+

modules/cco-ccoctl-creating-at-once.adoc

Lines changed: 58 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,16 @@ $ RELEASE_IMAGE=$(./openshift-install version | awk '/release image/ {print $3}'
149149
$ oc adm release extract \
150150
--from=$RELEASE_IMAGE \
151151
--credentials-requests \
152-
--included \// <1>
153-
--install-config=<path_to_directory_with_installation_configuration>/install-config.yaml \// <2>
154-
--to=<path_to_directory_for_credentials_requests> <3>
152+
--included \
153+
--install-config=<path_to_directory_with_installation_configuration>/install-config.yaml \
154+
--to=<path_to_directory_for_credentials_requests>
155155
----
156-
<1> The `--included` parameter includes only the manifests that your specific cluster configuration requires.
157-
<2> Specify the location of the `install-config.yaml` file.
158-
<3> Specify the path to the directory where you want to store the `CredentialsRequest` objects. If the specified directory does not exist, this command creates it.
156+
+
157+
where:
158+
+
159+
`--included`:: Specifies to include only the manifests that your specific cluster configuration requires.
160+
`<path_to_directory_with_installation_configuration>`:: Specifies the location of the `install-config.yaml` file.
161+
`<path_to_directory_for_credentials_requests>`:: Specifies the path to the directory where you want to store the `CredentialsRequest` objects. If the specified directory does not exist, this command creates it.
159162
+
160163
[NOTE]
161164
====
@@ -179,19 +182,22 @@ ifdef::aws-sts[]
179182
[source,terminal]
180183
----
181184
$ ccoctl aws create-all \
182-
--name=<name> \// <1>
183-
--region=<aws_region> \// <2>
184-
--credentials-requests-dir=<path_to_credentials_requests_directory> \// <3>
185-
--output-dir=<path_to_ccoctl_output_dir> \// <4>
186-
--create-private-s3-bucket \// <5>
187-
--permissions-boundary-arn=<policy_arn> <6>
185+
--name=<name> \
186+
--region=<aws_region> \
187+
--credentials-requests-dir=<path_to_credentials_requests_directory> \
188+
--output-dir=<path_to_ccoctl_output_dir> \
189+
--create-private-s3-bucket \
190+
--permissions-boundary-arn=<policy_arn>
188191
----
189-
<1> Specify the name used to tag any cloud resources that are created for tracking.
190-
<2> Specify the AWS region in which cloud resources will be created.
191-
<3> Specify the directory containing the files for the component `CredentialsRequest` objects.
192-
<4> Optional: Specify the directory in which you want the `ccoctl` utility to create objects. By default, the utility creates objects in the directory in which the commands are run.
193-
<5> Optional: By default, the `ccoctl` utility stores the OpenID Connect (OIDC) configuration files in a public S3 bucket and uses the S3 URL as the public OIDC endpoint. To store the OIDC configuration in a private S3 bucket that is accessed by the IAM identity provider through a public CloudFront distribution URL instead, use the `--create-private-s3-bucket` parameter.
194-
<6> Optional: Specify the Amazon Resource Name (ARN) of the {aws-short} IAM policy to use as the permissions boundary for the IAM roles created by the `ccoctl` utility.
192+
+
193+
where:
194+
+
195+
`<name>`:: Specifies the name used to tag any cloud resources that are created for tracking.
196+
`<aws_region>`:: Specifies the AWS region in which cloud resources will be created.
197+
`<path_to_credentials_requests_directory>`:: Specifies the directory containing the files for the component `CredentialsRequest` objects.
198+
`<path_to_ccoctl_output_dir>`:: Specifies the directory in which you want the `ccoctl` utility to create objects. By default, the utility creates objects in the directory in which the commands are run. This parameter is optional.
199+
`--create-private-s3-bucket`:: Specifies that the OpenID Connect (OIDC) configuration files should be stored in a private S3 bucket that is accessed by the IAM identity provider through a public CloudFront distribution URL. Note that by default, the `ccoctl` utility stores the OIDC configuration files in a public S3 bucket and uses the S3 URL as the public OIDC endpoint. This parameter is optional.
200+
`<policy_arn>`:: Specifies the Amazon Resource Name (ARN) of the {aws-short} IAM policy to use as the permissions boundary for the IAM roles created by the `ccoctl` utility. This parameter is optional.
195201
+
196202
[NOTE]
197203
====
@@ -202,17 +208,20 @@ ifdef::google-cloud-platform[]
202208
[source,terminal]
203209
----
204210
$ ccoctl gcp create-all \
205-
--name=<name> \// <1>
206-
--region=<gcp_region> \// <2>
207-
--project=<gcp_project_id> \// <3>
208-
--credentials-requests-dir=<path_to_credentials_requests_directory> \// <4>
209-
--key-storage-method=<key_storage_method> <5>
211+
--name=<name> \
212+
--region=<gcp_region> \
213+
--project=<gcp_project_id> \
214+
--credentials-requests-dir=<path_to_credentials_requests_directory> \
215+
--key-storage-method=<key_storage_method>
210216
----
211-
<1> Specify the user-defined name for all created {gcp-short} resources used for tracking. If you plan to install the {gcp-short} Filestore Container Storage Interface (CSI) Driver Operator, retain this value.
212-
<2> Specify the {gcp-short} region in which cloud resources will be created.
213-
<3> Specify the {gcp-short} project ID in which cloud resources will be created.
214-
<4> Specify the directory containing the files of `CredentialsRequest` manifests to create {gcp-short} service accounts.
215-
<5> Optional: Specify the method for storing OIDC JWK files. Accepted values are `public-bucket` and `pool-jwk-file`. The default value `public-bucket` creates a public GCS bucket to host the OIDC configuration and JWK files. The `pool-jwk-file` value attaches the JWK directly to the workload identity pool provider without creating a public bucket.
217+
+
218+
where:
219+
+
220+
`<name>`:: Specifies the user-defined name for all created {gcp-short} resources used for tracking. If you plan to install the {gcp-short} Filestore Container Storage Interface (CSI) Driver Operator, retain this value.
221+
`<gcp_region>`:: Specifies the {gcp-short} region in which cloud resources will be created.
222+
`<gcp_project_id>`:: Specifies the {gcp-short} project ID in which cloud resources will be created.
223+
`<path_to_credentials_requests_directory>`:: Specifies the directory containing the files of `CredentialsRequest` manifests to create {gcp-short} service accounts.
224+
`<key_storage_method>`:: Specifies the method for storing OIDC JWK files. Accepted values are `public-bucket` and `pool-jwk-file`. The default value `public-bucket` creates a public GCS bucket to host the OIDC configuration and JWK files. The `pool-jwk-file` value attaches the JWK directly to the workload identity pool provider without creating a public bucket. This parameter is optional.
216225
+
217226
[NOTE]
218227
====
@@ -223,25 +232,28 @@ ifdef::azure-workload-id[]
223232
[source,terminal]
224233
----
225234
$ ccoctl azure create-all \
226-
--name=<azure_infra_name> \// <1>
227-
--output-dir=<ccoctl_output_dir> \// <2>
228-
--region=<azure_region> \// <3>
229-
--subscription-id=<azure_subscription_id> \// <4>
230-
--credentials-requests-dir=<path_to_credentials_requests_directory> \// <5>
231-
--dnszone-resource-group-name=<azure_dns_zone_resource_group_name> \// <6>
232-
--tenant-id=<azure_tenant_id> \// <7>
233-
--network-resource-group-name <azure_resource_group> \// <8>
234-
--preserve-existing-roles <9>
235+
--name=<azure_infra_name> \
236+
--output-dir=<ccoctl_output_dir> \
237+
--region=<azure_region> \
238+
--subscription-id=<azure_subscription_id> \
239+
--credentials-requests-dir=<path_to_credentials_requests_directory> \
240+
--dnszone-resource-group-name=<azure_dns_zone_resource_group_name> \
241+
--tenant-id=<azure_tenant_id> \
242+
--network-resource-group-name <azure_resource_group> \
243+
--preserve-existing-roles
235244
----
236-
<1> Specify the user-defined name for all created Azure resources used for tracking.
237-
<2> Optional: Specify the directory in which you want the `ccoctl` utility to create objects. By default, the utility creates objects in the directory in which the commands are run.
238-
<3> Specify the Azure region in which cloud resources will be created.
239-
<4> Specify the Azure subscription ID to use.
240-
<5> Specify the directory containing the files for the component `CredentialsRequest` objects.
241-
<6> Specify the name of the resource group containing the cluster's base domain Azure DNS zone.
242-
<7> Specify the Azure tenant ID to use.
243-
<8> Optional: Specify the virtual network resource group if it is different from the cluster resource group.
244-
<9> Optional: Specify this flag to ensure that any custom role assignments you define on managed identities are not removed during {product-title} updates.
245+
+
246+
where:
247+
+
248+
`<azure_infra_name>`:: Specifies the user-defined name for all created Azure resources used for tracking.
249+
`<ccoctl_output_dir>`:: Specifies the directory in which you want the `ccoctl` utility to create objects. By default, the utility creates objects in the directory in which the commands are run. This parameter is optional.
250+
`<azure_region>`:: Specifies the Azure region in which cloud resources will be created.
251+
`<azure_subscription_id>`:: Specifies the Azure subscription ID to use.
252+
`<path_to_credentials_requests_directory>`:: Specifies the directory containing the files for the component `CredentialsRequest` objects.
253+
`<azure_dns_zone_resource_group_name>`:: Specifies the name of the resource group containing the cluster's base domain Azure DNS zone.
254+
`<azure_tenant_id>`:: Specifies the Azure tenant ID to use.
255+
`<azure_resource_group>`:: Specifies the virtual network resource group if it is different from the cluster resource group. This parameter is optional.
256+
`--preserve-existing-roles`:: Specifies that any custom role assignments you define on managed identities are not removed during {product-title} updates. This parameter is optional.
245257
+
246258
[NOTE]
247259
====

modules/procedure-enabling-bgp-evpn-primary-cudn.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,5 +403,3 @@ spec:
403403
----
404404
////
405405
406-
407-

0 commit comments

Comments
 (0)