Skip to content

Conversation

@themr0c
Copy link
Member

@themr0c themr0c commented Nov 13, 2024

IMPORTANT: Do Not Merge - To be merged by Docs Team Only

Version(s): 1.3.1, 1.4

Issue: https://issues.redhat.com/browse/RHIDP-3976

Link to docs preview: https://redhat-developer.github.io/red-hat-developers-documentation-rhdh/pr-704/authorization/#managing-authorizations-by-using-external-files

Reviews:

  • SME: @ mention assignee
  • QE: @ mention assignee
  • Docs review: @ mention assignee
  • Additional review: @mention assignee (by writer)

Additional information:

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Nov 13, 2024

@themr0c
Copy link
Member Author

themr0c commented Nov 13, 2024

@AndrienkoAleksandr can you review (I can't assign you as reviewer, you might need to ask to be added to the https://github.com/orgs/redhat-developer/teams/rhdh-team team).

…-files-by-using-the-operator.adoc

Co-authored-by: Oleksandr Andriienko <[email protected]>
…-files-by-using-the-operator.adoc

Co-authored-by: Oleksandr Andriienko <[email protected]>
@themr0c themr0c added Technical review done ⛅ Any procedure has been succesfully tested and removed Technical review needed 🔩 Test all the procedures labels Nov 19, 2024
@themr0c themr0c merged commit 8a0575b into redhat-developer:main Nov 22, 2024
3 checks passed
@themr0c themr0c deleted the RHIDP-3976 branch November 22, 2024 14:05
@themr0c
Copy link
Member Author

themr0c commented Nov 22, 2024

/cherry-pick release-1.3

@openshift-cherrypick-robot
Copy link
Contributor

@themr0c: #704 failed to apply on top of branch "release-1.3":

Applying: RHID-3976 Managing authorization by importing external files
.git/rebase-apply/patch:101: new blank line at EOF.
+
.git/rebase-apply/patch:153: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	assemblies/assembly-configuring-authorization-in-rhdh.adoc
M	modules/authorization/proc-mounting-the-policy-csv-file-using-helm.adoc
M	modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc
Falling back to patching base and 3-way merge...
Removing modules/authorization/proc-rbac-config-conditional-policy-file.adoc
CONFLICT (modify/delete): modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc deleted in RHID-3976 Managing authorization by importing external files and modified in HEAD. Version HEAD of modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc left in tree.
CONFLICT (modify/delete): modules/authorization/proc-mounting-the-policy-csv-file-using-helm.adoc deleted in RHID-3976 Managing authorization by importing external files and modified in HEAD. Version HEAD of modules/authorization/proc-mounting-the-policy-csv-file-using-helm.adoc left in tree.
Removing modules/authorization/con-rbac-config-permission-policies.adoc
Removing modules/authorization/con-rbac-config-permission-policies-external-file.adoc
Auto-merging assemblies/assembly-configuring-authorization-in-rhdh.adoc
CONFLICT (content): Merge conflict in assemblies/assembly-configuring-authorization-in-rhdh.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 advice.mergeConflict false"
Patch failed at 0001 RHID-3976 Managing authorization by importing external files

In response to this:

/cherry-pick release-1.3

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.

themr0c added a commit to themr0c/red-hat-developers-documentation-rhdh that referenced this pull request Nov 22, 2024
themr0c added a commit that referenced this pull request Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants