Skip to content

RHDEVDOCS-7087: CQA 2.0 fixes for Customizing permissions by creating user-defined cluster roles for cluster-scoped instances#108935

Merged
Dhruv-Soni11 merged 1 commit intoopenshift:gitops-docs-mainfrom
Dhruv-Soni11:RHDEVDOCS-7087
Apr 14, 2026
Merged

RHDEVDOCS-7087: CQA 2.0 fixes for Customizing permissions by creating user-defined cluster roles for cluster-scoped instances#108935
Dhruv-Soni11 merged 1 commit intoopenshift:gitops-docs-mainfrom
Dhruv-Soni11:RHDEVDOCS-7087

Conversation

@Dhruv-Soni11
Copy link
Copy Markdown
Contributor

@Dhruv-Soni11 Dhruv-Soni11 commented Mar 24, 2026

Version(s):

gitops-docs-1.19, gitops-docs-1.20

Issue:

https://redhat.atlassian.net/browse/RHDEVDOCS-7087

Link to docs preview:

Customizing permissions by creating user-defined cluster roles for cluster-scoped instances

Peer review:

  • Peer has approved this change.

Peer reviewer:

Additional information:

… user-defined cluster roles for cluster-scoped instances
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 24, 2026

@Dhruv-Soni11: This pull request references RHDEVDOCS-7087 which is a valid jira issue.

Details

In response to this:

… user-defined cluster roles for cluster-scoped instances

Version(s):

Issue:

https://redhat.atlassian.net/browse/RHDEVDOCS-7087

Link to docs preview:

Peer review:

  • Peer has approved this change.

Peer reviewer:

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 24, 2026
@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 24, 2026
@ocpdocs-previewbot
Copy link
Copy Markdown

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 24, 2026

@Dhruv-Soni11: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@Dhruv-Soni11 Dhruv-Soni11 changed the title RHDEVDOCS-7087: CQA 2.0 fixes for Customizing permissions by creating… RHDEVDOCS-7087: CQA 2.0 fixes for Customizing permissions by creating user-defined cluster roles for cluster-scoped instances Mar 24, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 24, 2026

@Dhruv-Soni11: This pull request references RHDEVDOCS-7087 which is a valid jira issue.

Details

In response to this:

Version(s):

Issue:

https://redhat.atlassian.net/browse/RHDEVDOCS-7087

Link to docs preview:

Peer review:

  • Peer has approved this change.

Peer reviewer:

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 24, 2026

@Dhruv-Soni11: This pull request references RHDEVDOCS-7087 which is a valid jira issue.

Details

In response to this:

Version(s):

gitops-docs-1.19, gitops-docs-1.20

Issue:

https://redhat.atlassian.net/browse/RHDEVDOCS-7087

Link to docs preview:

Customizing permissions by creating user-defined cluster roles for cluster-scoped instances

Peer review:

  • Peer has approved this change.

Peer reviewer:

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@shivanisathe25
Copy link
Copy Markdown
Contributor

LGTM

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 14, 2026

@Dhruv-Soni11: This pull request references RHDEVDOCS-7087 which is a valid jira issue.

Details

In response to this:

Version(s):

gitops-docs-1.19, gitops-docs-1.20

Issue:

https://redhat.atlassian.net/browse/RHDEVDOCS-7087

Link to docs preview:

Customizing permissions by creating user-defined cluster roles for cluster-scoped instances

Peer review:

  • Peer has approved this change.

Peer reviewer:

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@Dhruv-Soni11 Dhruv-Soni11 merged commit aadb7ee into openshift:gitops-docs-main Apr 14, 2026
2 checks passed
@Dhruv-Soni11
Copy link
Copy Markdown
Contributor Author

/cherrypick gitops-docs-1.19

@Dhruv-Soni11
Copy link
Copy Markdown
Contributor Author

/cherrypick gitops-docs-1.20

@openshift-cherrypick-robot
Copy link
Copy Markdown

@Dhruv-Soni11: #108935 failed to apply on top of branch "gitops-docs-1.19":

Applying: RHDEVDOCS-7087: CQA 2.0 fixes for Customizing permissions by creating user-defined cluster roles for cluster-scoped instances
.git/rebase-apply/patch:16: trailing whitespace.
For the default cluster-scoped instance, the {gitops-title} Operator grants additional permissions for managing certain cluster-scoped resources. Consequently, as a cluster administrator, when you deploy Argo CD as a cluster-scoped instance, the Operator creates additional cluster roles and cluster role bindings for the {gitops-shortname} control plane components. These cluster roles and cluster role bindings provide the additional permissions that Argo CD requires to operate at the cluster level. 
.git/rebase-apply/patch:43: trailing whitespace.
* You have installed a xref:../declarative_clusterconfig/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc#using-argo-cd-instance-to-manage-cluster-scoped-resources_configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations[cluster-scoped Argo CD instance] in your defined namespace, for example, the `spring-petclinic` namespace. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	declarative_clusterconfig/customizing-permissions-by-creating-user-defined-cluster-roles-for-cluster-scoped-instances.adoc
M	modules/gitops-customizing-permissions-for-cluster-scoped-instances.adoc
M	modules/gitops-disabling-the-creation-of-the-default-cluster-roles-for-the-cluster-scoped-instance.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/gitops-disabling-the-creation-of-the-default-cluster-roles-for-the-cluster-scoped-instance.adoc
Auto-merging modules/gitops-customizing-permissions-for-cluster-scoped-instances.adoc
Auto-merging declarative_clusterconfig/customizing-permissions-by-creating-user-defined-cluster-roles-for-cluster-scoped-instances.adoc
CONFLICT (content): Merge conflict in declarative_clusterconfig/customizing-permissions-by-creating-user-defined-cluster-roles-for-cluster-scoped-instances.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 RHDEVDOCS-7087: CQA 2.0 fixes for Customizing permissions by creating user-defined cluster roles for cluster-scoped instances

Details

In response to this:

/cherrypick gitops-docs-1.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@Dhruv-Soni11: #108935 failed to apply on top of branch "gitops-docs-1.20":

Applying: RHDEVDOCS-7087: CQA 2.0 fixes for Customizing permissions by creating user-defined cluster roles for cluster-scoped instances
.git/rebase-apply/patch:16: trailing whitespace.
For the default cluster-scoped instance, the {gitops-title} Operator grants additional permissions for managing certain cluster-scoped resources. Consequently, as a cluster administrator, when you deploy Argo CD as a cluster-scoped instance, the Operator creates additional cluster roles and cluster role bindings for the {gitops-shortname} control plane components. These cluster roles and cluster role bindings provide the additional permissions that Argo CD requires to operate at the cluster level. 
.git/rebase-apply/patch:43: trailing whitespace.
* You have installed a xref:../declarative_clusterconfig/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc#using-argo-cd-instance-to-manage-cluster-scoped-resources_configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations[cluster-scoped Argo CD instance] in your defined namespace, for example, the `spring-petclinic` namespace. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	declarative_clusterconfig/customizing-permissions-by-creating-user-defined-cluster-roles-for-cluster-scoped-instances.adoc
M	modules/gitops-customizing-permissions-for-cluster-scoped-instances.adoc
M	modules/gitops-disabling-the-creation-of-the-default-cluster-roles-for-the-cluster-scoped-instance.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/gitops-disabling-the-creation-of-the-default-cluster-roles-for-the-cluster-scoped-instance.adoc
Auto-merging modules/gitops-customizing-permissions-for-cluster-scoped-instances.adoc
Auto-merging declarative_clusterconfig/customizing-permissions-by-creating-user-defined-cluster-roles-for-cluster-scoped-instances.adoc
CONFLICT (content): Merge conflict in declarative_clusterconfig/customizing-permissions-by-creating-user-defined-cluster-roles-for-cluster-scoped-instances.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 RHDEVDOCS-7087: CQA 2.0 fixes for Customizing permissions by creating user-defined cluster roles for cluster-scoped instances

Details

In response to this:

/cherrypick gitops-docs-1.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants