Skip to content

Remove duplicate Additional resources link from API impersonation pages (CP to main-4.20) - #117407

Merged
dfitzmau merged 1 commit into
openshift:mainfrom
aksjoshi89:CP-OSDOCS-16961-CQA-1-New
Aug 6, 2026
Merged

Remove duplicate Additional resources link from API impersonation pages (CP to main-4.20)#117407
dfitzmau merged 1 commit into
openshift:mainfrom
aksjoshi89:CP-OSDOCS-16961-CQA-1-New

Conversation

@aksjoshi89

@aksjoshi89 aksjoshi89 commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

This PR has been raised to remove one of the double Additional resources. The issue exists from main to 4.20.
Reference PR: #117393

@openshift-ci openshift-ci Bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 6, 2026
@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown

@aksjoshi89: 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.

@dfitzmau
dfitzmau merged commit 226db02 into openshift:main Aug 6, 2026
2 checks passed
@dfitzmau

dfitzmau commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.22

@dfitzmau

dfitzmau commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.21

@dfitzmau

dfitzmau commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.20

@dfitzmau

dfitzmau commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-5.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

@dfitzmau: #117407 failed to apply on top of branch "enterprise-4.22":

Applying: CP to main-4.20
Using index info to reconstruct a base tree...
M	applications/projects/creating-project-other-user.adoc
Falling back to patching base and 3-way merge...
Auto-merging applications/projects/creating-project-other-user.adoc
CONFLICT (content): Merge conflict in applications/projects/creating-project-other-user.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 CP to main-4.20

Details

In response to this:

/cherrypick enterprise-4.22

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

@dfitzmau: #117407 failed to apply on top of branch "enterprise-4.21":

Applying: CP to main-4.20
Using index info to reconstruct a base tree...
M	applications/projects/creating-project-other-user.adoc
Falling back to patching base and 3-way merge...
Auto-merging applications/projects/creating-project-other-user.adoc
CONFLICT (content): Merge conflict in applications/projects/creating-project-other-user.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 CP to main-4.20

Details

In response to this:

/cherrypick enterprise-4.21

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

@dfitzmau: #117407 failed to apply on top of branch "enterprise-5.0":

Applying: CP to main-4.20
Using index info to reconstruct a base tree...
M	applications/projects/creating-project-other-user.adoc
Falling back to patching base and 3-way merge...
Auto-merging applications/projects/creating-project-other-user.adoc
CONFLICT (content): Merge conflict in applications/projects/creating-project-other-user.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 CP to main-4.20

Details

In response to this:

/cherrypick enterprise-5.0

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

@dfitzmau: new pull request created: #117410

Details

In response to this:

/cherrypick enterprise-4.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.

@dfitzmau

dfitzmau commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.22

@openshift-cherrypick-robot

Copy link
Copy Markdown

@dfitzmau: #117407 failed to apply on top of branch "enterprise-4.22":

Applying: CP to main-4.20
Using index info to reconstruct a base tree...
M	applications/projects/creating-project-other-user.adoc
Falling back to patching base and 3-way merge...
Auto-merging applications/projects/creating-project-other-user.adoc
CONFLICT (content): Merge conflict in applications/projects/creating-project-other-user.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 CP to main-4.20

Details

In response to this:

/cherrypick enterprise-4.22

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

size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants