Skip to content

Commit a97c342

Browse files
authored
Merge pull request #86442 from fmcdonal/OSDOCS-11772.1
OSDOCS-11772.1 (12965): Upgrade ROSA with HCP cluster through Openshift Cluster manager console with xref links
2 parents f1afbca + 7adfa43 commit a97c342

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

modules/rosa-red-hat-support-access.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Write: None
2929

3030
Write: None
3131

32-
|OpenShift SRE - Elevated Access ^[2]^ (Gated by link:https://docs.openshift.com/rosa/support/approved-access.html[Approved Access])| Read: All
32+
|OpenShift SRE - Elevated Access ^[2]^ (Gated by link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html/support/approved-access[Approved Access])| Read: All
3333

3434
Write: All
3535

@@ -111,6 +111,6 @@ Write: None
111111
|===
112112
--
113113
1. Limited to addressing common use cases such as failing deployments, upgrading a cluster, and replacing bad worker nodes.
114-
2. Elevated access gives SRE the access levels of a cluster-admin role. See link:https://docs.openshift.com/container-platform/4.17/authentication/using-rbac.html#default-roles_using-rbac[cluster roles] for more information.
114+
2. Elevated access gives SRE the access levels of a cluster-admin role and is gated by Approved Access. For more information, see "Default cluster roles" and "Approved Access".
115115
3. Limited to what is granted through RBAC by the Customer Administrator and namespaces created by the user.
116116
--

rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ include::modules/rosa-sdpolicy-instance-types.adoc[leveloffset=+2]
3131
[role="_additional-resources"]
3232
.Additional resources
3333

34-
For a detailed listing of supported instance types, see
34+
For a detailed listing of supported instance types, see
3535
ifdef::openshift-rosa-hcp[]
3636
xref:../rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-instance-types[{product-title} instance types].
3737
endif::openshift-rosa-hcp[]

rosa_architecture/rosa_policy_service_definition/rosa-sre-access.adoc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,21 @@ For a list of the available subprocessors, see the link:https://access.redhat.co
1616

1717
include::modules/sre-cluster-access.adoc[leveloffset=+1]
1818
include::modules/rosa-red-hat-support-access.adoc[leveloffset=+1]
19+
[role="_additional-resources"]
20+
.Additional resources
21+
* For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html/support/approved-access[Approved Access].
22+
23+
* For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html/authentication_and_authorization/using-rbac#default-roles_using-rbac[Default cluster roles]
24+
1925
include::modules/rosa-customer-access.adoc[leveloffset=+1]
2026
include::modules/rosa-access-approval-review.adoc[leveloffset=+1]
2127
include::modules/how-service-accounts-assume-aws-iam-roles-in-sre-owned-projects.adoc[leveloffset=+1]
2228

23-
ifndef::openshift-rosa-hcp[]
2429
[role="_additional-resources"]
2530
.Additional resources
2631

27-
* For more information about the AWS IAM roles used by the cluster Operators, see xref:../../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-operator-roles_rosa-sts-about-iam-resources[Cluster-specific Operator IAM role reference].
32+
* For more information about the AWS IAM roles used by the cluster Operators, see https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html/introduction_to_rosa/rosa-sts-about-iam-resources#rosa-sts-operator-roles_rosa-sts-about-iam-resources[Cluster-specific Operator IAM role reference].
33+
34+
* For more information about the policies and permissions that the cluster Operators require, see https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html/introduction_to_rosa/rosa-sts-about-iam-resources#rosa-sts-account-wide-roles-and-policies-creation-methods_rosa-sts-about-iam-resources[Methods of account-wide role creation].
2835

29-
* For more information about the policies and permissions that the cluster Operators require, see xref:../../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-account-wide-roles-and-policies-creation-methods_rosa-sts-about-iam-resources[Methods of account-wide role creation].
30-
endif::openshift-rosa-hcp[]
36+
* For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html/support/approved-access[Approved Access].

0 commit comments

Comments
 (0)