Skip to content

Commit a2739f0

Browse files
authored
Merge pull request #65931 from openshift/revert-53514-OSDOCS-4265_OIDC-CloudFront
Revert "OSDOCS-4265: Updates some ROSA cli items for CloudFront"
2 parents 4fc4d17 + 3b8e73a commit a2739f0

File tree

5 files changed

+8
-21
lines changed

5 files changed

+8
-21
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://dvbwgdztaeq9o.cloudfront.net/20eh31t5vaasiidbumcjfbnknb6c6883 <3>
73+
OIDC Endpoint URL: https://rh-oidc.s3.us-east-1.amazonaws.com/1s5v4k39lhm8sm59m90mi0822o31844a <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> Displays the endpoint URL for the cluster-specific OIDC provider.
77+
<3> Specifies 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ State: ready
381381
Private: No
382382
Created: Oct 1 2021 08:12:25 UTC
383383
Details Page: https://console.redhat.com/openshift/details/s/<subscription_id>
384-
OIDC Endpoint URL: https://dvbwgdztaeq9o.cloudfront.net/<cluster_id>
384+
OIDC Endpoint URL: https://rh-oidc.s3.<aws_region>.amazonaws.com/<cluster_id>
385385
----
386386
+
387387
The following `State` field changes are listed in the output as the cluster installation progresses:

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,14 @@ When using `manual` mode, the `aws` command is printed to the terminal for your
2929
====
3030
+
3131
.Command output
32-
[source,textl]
32+
[source,terminal]
3333
----
3434
aws iam create-open-id-connect-provider \
35-
--url https://<generated uid>.cloudfront.net/<cluster id> \// <1>
35+
--url https://rh-oidc.s3.<aws_region>.amazonaws.com/<cluster_id> \
3636
--client-id-list openshift sts.<aws_region>.amazonaws.com \
37-
--thumbprint-list <thumbprint> <2>
37+
--thumbprint-list <thumbprint> <1>
3838
----
39-
<1> The URL used to reach the OpenID Connect (OIDC) identity provider once 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) 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 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].
4140
4241
** Registered OIDC configurations use an OIDC configuration ID. Run the following command with your OIDC configuration ID:
4342
+

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-
include::snippets/oidc-cloudfront.adoc[]
24+
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: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)