Skip to content

Commit

Permalink
Merge pull request #86520 from openshift-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-86442-to-enterprise-4.17

[enterprise-4.17] OSDOCS-11772.1 (12965): Upgrade ROSA with HCP cluster through Openshift Cluster manager console with xref links
  • Loading branch information
EricPonvelle authored Dec 20, 2024
2 parents ee6e9d2 + 3c14bf1 commit 7b50a53
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
4 changes: 2 additions & 2 deletions modules/rosa-red-hat-support-access.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Write: None

Write: None

|OpenShift SRE - Elevated Access ^[2]^ (Gated by link:https://docs.openshift.com/rosa/support/approved-access.html[Approved Access])| Read: All
|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

Write: All

Expand Down Expand Up @@ -111,6 +111,6 @@ Write: None
|===
--
1. Limited to addressing common use cases such as failing deployments, upgrading a cluster, and replacing bad worker nodes.
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.
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".
3. Limited to what is granted through RBAC by the Customer Administrator and namespaces created by the user.
--
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ include::modules/rosa-sdpolicy-instance-types.adoc[leveloffset=+2]
[role="_additional-resources"]
.Additional resources

For a detailed listing of supported instance types, see
For a detailed listing of supported instance types, see
ifdef::openshift-rosa-hcp[]
xref:../rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-instance-types[{product-title} instance types].
endif::openshift-rosa-hcp[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,21 @@ For a list of the available subprocessors, see the link:https://access.redhat.co

include::modules/sre-cluster-access.adoc[leveloffset=+1]
include::modules/rosa-red-hat-support-access.adoc[leveloffset=+1]
[role="_additional-resources"]
.Additional resources
* For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html/support/approved-access[Approved Access].

* 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]

include::modules/rosa-customer-access.adoc[leveloffset=+1]
include::modules/rosa-access-approval-review.adoc[leveloffset=+1]
include::modules/how-service-accounts-assume-aws-iam-roles-in-sre-owned-projects.adoc[leveloffset=+1]

ifndef::openshift-rosa-hcp[]
[role="_additional-resources"]
.Additional resources

* 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].
* 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].

* 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].

* 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].
endif::openshift-rosa-hcp[]
* 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 comments on commit 7b50a53

Please sign in to comment.