Skip to content

Commit b36bca6

Browse files
authored
Merge pull request #66471 from EricPonvelle/OSDOCS-4265_OIDC-CloudFront-NEW
OSDOCS-4265: Updates some ROSA cli items for CloudFront
2 parents 8c545d6 + c9dc139 commit b36bca6

File tree

5 files changed

+24
-7
lines changed

5 files changed

+24
-7
lines changed

modules/rosa-deleting-cluster.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ State: ready
7070
Private: No
7171
Created: May 13 2022 11:26:15 UTC
7272
Details Page: https://console.redhat.com/openshift/details/s/296kyEFwzoy1CREQicFRdZybrc0
73-
OIDC Endpoint URL: https://rh-oidc.s3.us-east-1.amazonaws.com/1s5v4k39lhm8sm59m90mi0822o31844a <3>
73+
OIDC Endpoint URL: https://oidc.op1.openshiftapps.com/<oidc_config_id> <3>
7474
----
7575
<1> Lists the cluster ID.
7676
<2> Specifies the ARNs for the cluster-specific Operator roles. For example, in the sample output the ARN for the role required by the Machine Config Operator is `arn:aws:iam::<aws_account_id>:role/mycluster-x4q9-openshift-machine-api-aws-cloud-credentials`.
77-
<3> Specifies the endpoint URL for the cluster-specific OIDC provider.
77+
<3> Displays the endpoint URL for the cluster-specific OIDC provider.
7878
+
7979
[IMPORTANT]
8080
====

modules/rosa-sts-creating-a-cluster-with-customizations-cli.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,13 @@ State: ready
396396
Private: No
397397
Created: Oct 1 2021 08:12:25 UTC
398398
Details Page: https://console.redhat.com/openshift/details/s/<subscription_id>
399-
OIDC Endpoint URL: https://rh-oidc.s3.<aws_region>.amazonaws.com/<cluster_id>
399+
OIDC Endpoint URL: https://oidc.op1.openshiftapps.com/<cluster_id>|<oidc_config_id> \ <1>
400400
----
401401
+
402+
--
403+
1. The endpoint URL depends on the BYO OIDC configuration. If you are pre-creating the OIDC configuration, the URL ends with the `<oidc_config_id>` value; otherwise, the URL ends with the `<cluster-ID>` value.
404+
--
405+
+
402406
The following `State` field changes are listed in the output as the cluster installation progresses:
403407
+
404408
* `waiting (Waiting for OIDC configuration)`

modules/rosa-sts-oidc-provider-command.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ When using `manual` mode, the `aws` command is printed to the terminal for your
3232
[source,terminal]
3333
----
3434
aws iam create-open-id-connect-provider \
35-
--url https://rh-oidc.s3.<aws_region>.amazonaws.com/<cluster_id> \
35+
--url https://oidc.op1.openshiftapps.com/<oidc_config_id> \// <1>
3636
--client-id-list openshift sts.<aws_region>.amazonaws.com \
37-
--thumbprint-list <thumbprint> <1>
37+
--thumbprint-list <thumbprint> <2>
3838
----
39-
<1> The thumbprint is generated automatically when you run the `rosa create oidc-provider` command. For more information about using thumbprints with AWS Identity and Access Management (IAM) OpenID Connect (OIDC) identity providers, see link:https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc_verify-thumbprint.html[the AWS documentation].
39+
<1> The URL used to reach the OpenID Connect (OIDC) identity provider after the cluster is created.
40+
<2> The thumbprint is generated automatically when you run the `rosa create oidc-provider` command. For more information about using thumbprints with AWS Identity and Access Management (IAM) OIDC identity providers, see link:https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc_verify-thumbprint.html[the AWS documentation].
4041
4142
** Registered OIDC configurations use an OIDC configuration ID. Run the following command with your OIDC configuration ID:
4243
+

rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Alternatively, you can use `manual` mode, which outputs the `aws` commands neede
2121
.Next steps
2222

2323
* Ensure that you have completed the xref:../rosa_planning/rosa-sts-aws-prereqs.adoc[AWS prerequisites].
24-
24+
include::snippets/oidc-cloudfront.adoc[]
2525
include::modules/rosa-sts-overview-of-the-default-cluster-specifications.adoc[leveloffset=+1]
2626
include::modules/rosa-sts-understanding-aws-account-association.adoc[leveloffset=+1]
2727

snippets/oidc-cloudfront.adoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
//This snippet appears in the following assemblies:
3+
//
4+
// * ../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc
5+
6+
:_content-type: SNIPPET
7+
[NOTE]
8+
====
9+
ROSA CLI 1.2.7 introduces changes to the OIDC provider endpoint URL format for new clusters. {product-title} cluster OIDC provider URLs are no longer regional. The AWS CloudFront implementation provides improved access speed and resiliency and reduces latency.
10+
11+
Because this change is only available to new clusters created by using ROSA CLI 1.2.7 or later, existing OIDC-provider configurations do not have any supported migration paths.
12+
====

0 commit comments

Comments
 (0)