Skip to content

OSDOCS Add additional resources heading to 'Additional CRI-O storage locations' assembly - #119646

Merged
mburke5678 merged 1 commit into
openshift:mainfrom
mburke5678:node-add-additional-resources
Sep 9, 2026
Merged

OSDOCS Add additional resources heading to 'Additional CRI-O storage locations' assembly#119646
mburke5678 merged 1 commit into
openshift:mainfrom
mburke5678:node-add-additional-resources

Conversation

@mburke5678

Copy link
Copy Markdown
Contributor

I noticed when creating the #118494 PR that the Additional resources section didn't have the proper role and ID tags. I added them there. @skopacz1 correctly suggesting using a separate PR to add to all branches.

@mburke5678 mburke5678 added this to the Continuous Release milestone Sep 9, 2026
@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 9, 2026
@ocpdocs-previewbot

ocpdocs-previewbot commented Sep 9, 2026

Copy link
Copy Markdown

@skopacz1 skopacz1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once merge conflicts are resolved, thanks!

@mburke5678
mburke5678 force-pushed the node-add-additional-resources branch from 0bce813 to 9bc8d48 Compare September 9, 2026 20:22
@openshift-ci

openshift-ci Bot commented Sep 9, 2026

Copy link
Copy Markdown

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

@mburke5678
mburke5678 merged commit f1a153d into openshift:main Sep 9, 2026
2 checks passed
@mburke5678
mburke5678 deleted the node-add-additional-resources branch September 9, 2026 20:42
@mburke5678

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.22

@mburke5678

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-5.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

@mburke5678: #119646 failed to apply on top of branch "enterprise-4.22":

Applying: OSDOCS Add additional resources heading to 'Additional CRI-O storage locations' assembly
Using index info to reconstruct a base tree...
M	nodes/nodes/nodes-nodes-additional-crio-storage.adoc
Falling back to patching base and 3-way merge...
Auto-merging nodes/nodes/nodes-nodes-additional-crio-storage.adoc
CONFLICT (content): Merge conflict in nodes/nodes/nodes-nodes-additional-crio-storage.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 OSDOCS Add additional resources heading to 'Additional CRI-O storage locations' assembly

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

@mburke5678: new pull request created: #119653

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.

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

Labels

branch/enterprise-4.22 branch/enterprise-5.0 ok-to-merge size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants