Skip to content

Conversation

@xenolinux
Copy link
Contributor

@xenolinux xenolinux commented Nov 14, 2025

This PR adds some minor fixes which were left incomplete in Ashwini's PR -- #95504

Version(s): 4.12+

Issue: OSDOCS-14994

Link to docs preview:

QE review: The acks are present in #95504.

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 14, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 14, 2025

🤖 Fri Nov 14 07:35:50 - Prow CI generated the docs preview:

https://102524--ocpdocs-pr.netlify.app/openshift-enterprise/latest/nodes/pods/nodes-pods-secrets-store.html

@xenolinux xenolinux force-pushed the complete-pr-95504 branch 2 times, most recently from 4aaaa0c to b34ee4c Compare November 14, 2025 07:12
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 14, 2025
@xenolinux
Copy link
Contributor Author

Merging this PR as the changes were already approved by SME,QE and the PR updates minor changes from the original PR #95504.

@openshift-ci
Copy link

openshift-ci bot commented Nov 14, 2025

@xenolinux: all tests passed!

Full PR test history. Your PR dashboard.

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.

@xenolinux xenolinux merged commit 112ff48 into openshift:main Nov 14, 2025
2 checks passed
@xenolinux xenolinux deleted the complete-pr-95504 branch November 14, 2025 07:38
@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.12

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.13

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.14

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.15

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.16

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.17

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.18

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.19

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.20

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.21

@openshift-cherrypick-robot

@xenolinux: #102524 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS#14994: Minor SSCSI fixes
Using index info to reconstruct a base tree...
A	modules/secrets-store-aws.adoc
A	modules/secrets-store-azure.adoc
A	modules/secrets-store-google.adoc
A	modules/secrets-store-vault.adoc
A	nodes/pods/nodes-pods-secrets-store.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): nodes/pods/nodes-pods-secrets-store.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of nodes/pods/nodes-pods-secrets-store.adoc left in tree.
CONFLICT (modify/delete): modules/secrets-store-vault.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-vault.adoc left in tree.
CONFLICT (modify/delete): modules/secrets-store-google.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-google.adoc left in tree.
CONFLICT (modify/delete): modules/secrets-store-azure.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-azure.adoc left in tree.
CONFLICT (modify/delete): modules/secrets-store-aws.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-aws.adoc left in tree.
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 OSDOCS#14994: Minor SSCSI fixes

In response to this:

/cherrypick enterprise-4.12

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

@xenolinux: #102524 failed to apply on top of branch "enterprise-4.13":

Applying: OSDOCS#14994: Minor SSCSI fixes
Using index info to reconstruct a base tree...
A	modules/secrets-store-aws.adoc
A	modules/secrets-store-azure.adoc
A	modules/secrets-store-google.adoc
A	modules/secrets-store-vault.adoc
A	nodes/pods/nodes-pods-secrets-store.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): nodes/pods/nodes-pods-secrets-store.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of nodes/pods/nodes-pods-secrets-store.adoc left in tree.
CONFLICT (modify/delete): modules/secrets-store-vault.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-vault.adoc left in tree.
CONFLICT (modify/delete): modules/secrets-store-google.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-google.adoc left in tree.
CONFLICT (modify/delete): modules/secrets-store-azure.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-azure.adoc left in tree.
CONFLICT (modify/delete): modules/secrets-store-aws.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-aws.adoc left in tree.
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 OSDOCS#14994: Minor SSCSI fixes

In response to this:

/cherrypick enterprise-4.13

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

@xenolinux: #102524 failed to apply on top of branch "enterprise-4.14":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

In response to this:

/cherrypick enterprise-4.14

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

@xenolinux: #102524 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS#14994: Minor SSCSI fixes
Using index info to reconstruct a base tree...
M	modules/secrets-store-aws.adoc
M	modules/secrets-store-azure.adoc
A	modules/secrets-store-google.adoc
A	modules/secrets-store-vault.adoc
M	nodes/pods/nodes-pods-secrets-store.adoc
Falling back to patching base and 3-way merge...
Auto-merging nodes/pods/nodes-pods-secrets-store.adoc
CONFLICT (content): Merge conflict in nodes/pods/nodes-pods-secrets-store.adoc
CONFLICT (modify/delete): modules/secrets-store-vault.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-vault.adoc left in tree.
CONFLICT (modify/delete): modules/secrets-store-google.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-google.adoc left in tree.
Auto-merging modules/secrets-store-azure.adoc
CONFLICT (content): Merge conflict in modules/secrets-store-azure.adoc
Auto-merging modules/secrets-store-aws.adoc
CONFLICT (content): Merge conflict in modules/secrets-store-aws.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 OSDOCS#14994: Minor SSCSI fixes

In response to this:

/cherrypick enterprise-4.15

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

@xenolinux: #102524 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS#14994: Minor SSCSI fixes
Using index info to reconstruct a base tree...
M	modules/secrets-store-aws.adoc
M	modules/secrets-store-azure.adoc
A	modules/secrets-store-google.adoc
M	modules/secrets-store-vault.adoc
M	nodes/pods/nodes-pods-secrets-store.adoc
Falling back to patching base and 3-way merge...
Auto-merging nodes/pods/nodes-pods-secrets-store.adoc
Auto-merging modules/secrets-store-vault.adoc
CONFLICT (content): Merge conflict in modules/secrets-store-vault.adoc
CONFLICT (modify/delete): modules/secrets-store-google.adoc deleted in HEAD and modified in OSDOCS#14994: Minor SSCSI fixes. Version OSDOCS#14994: Minor SSCSI fixes of modules/secrets-store-google.adoc left in tree.
Auto-merging modules/secrets-store-azure.adoc
CONFLICT (content): Merge conflict in modules/secrets-store-azure.adoc
Auto-merging modules/secrets-store-aws.adoc
CONFLICT (content): Merge conflict in modules/secrets-store-aws.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 OSDOCS#14994: Minor SSCSI fixes

In response to this:

/cherrypick enterprise-4.16

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.

@xenolinux
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@xenolinux: new pull request created: #102525

In response to this:

/cherrypick enterprise-4.17

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

@xenolinux: new pull request created: #102526

In response to this:

/cherrypick enterprise-4.18

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

@xenolinux: new pull request created: #102527

In response to this:

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

@xenolinux: new pull request created: #102528

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.

@openshift-cherrypick-robot

@xenolinux: new pull request created: #102529

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.

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.

3 participants