Skip to content

Commit

Permalink
Merge pull request #7366 from stolostron/swope-versioning2
Browse files Browse the repository at this point in the history
  • Loading branch information
swopebe authored Jan 10, 2025
2 parents 9b7fdb8 + 8881928 commit f30ac67
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion access_control/access_intro.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[#access-control]
= Access control

Access control might need to manually be created and managed. You must configure _authentication_ service requirements for {acm} to onboard workloads to Identity and Access Management (IAM). For more information, see link:https://docs.redhat.com/documentation/en-us/openshift_container_platform/4.15/html/authentication_and_authorization/understanding-authentication[Understanding authentication] in the {ocp-short} documentation.
Access control might need to manually be created and managed. You must configure _authentication_ service requirements for {acm} to onboard workloads to Identity and Access Management (IAM). For more information, see link:https://docs.redhat.com/documentation/en-us/openshift_container_platform/4.16/html/authentication_and_authorization/understanding-authentication[Understanding authentication] in the {ocp-short} documentation.

Role-based access control and authentication identifies the user associated roles and cluster credentials. See the following documentation for information about access and credentials.

Expand Down
2 changes: 1 addition & 1 deletion access_control/rbac.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[#rbac-rhacm]
= Role-based access control

{acm} supports role-based access control (RBAC). Your role determines the actions that you can perform. RBAC is based on the authorization mechanisms in Kubernetes, similar to {ocp}. For more information about RBAC, see the OpenShift _RBAC_ overview in the link:https://docs.redhat.com/documentation/en-us/openshift_container_platform/4.15/html/authentication_and_authorization/using-rbac[{ocp-short} documentation].
{acm} supports role-based access control (RBAC). Your role determines the actions that you can perform. RBAC is based on the authorization mechanisms in Kubernetes, similar to {ocp}. For more information about RBAC, see the OpenShift _RBAC_ overview in the link:https://docs.redhat.com/documentation/en-us/openshift_container_platform/4.16/html/authentication_and_authorization/using-rbac[{ocp-short} documentation].

*Note:* Action buttons are disabled from the console if the user-role access is impermissible.

Expand Down
4 changes: 2 additions & 2 deletions add-ons/modify_endpoint.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

You can modify the settings of `KlusterletAddonConfig` to change your configuration using the hub cluster.

The `KlusterletAddonConfig` controller manages the functions that are enabled and disabled according to the settings in the `klusterletaddonconfigs.agent.open-cluster-management.io` Kubernetes resource. View the following example of the `KlusterletAddonConfig`:
The `KlusterletAddonConfig` controller manages the functions that are enabled and disabled according to the settings in the `klusterletaddonconfigs.agent.open-cluster-management.io` Kubernetes resource. View the following example of the `KlusterletAddonConfig`, where the value for `<2.x.0>` is replaced with supported version you are using:

[source,yaml]
----
Expand All @@ -28,7 +28,7 @@ spec:
enabled: true
searchCollector:
enabled: false
version: 2.8.0
version: <2.x.0>
----

[#description-of-settings]
Expand Down

0 comments on commit f30ac67

Please sign in to comment.