Skip to content

HCM remove nodes-cluster-cgroups-okd assembly from topic map #96849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 30, 2025
Merged

HCM remove nodes-cluster-cgroups-okd assembly from topic map #96849

merged 1 commit into from
Jul 30, 2025
+0 −8

Conversation

mburke5678
Copy link
Contributor

@mburke5678 mburke5678 commented Jul 30, 2025 •
edited
Loading

The nodes-cluster-cgroups-okd.adoc assembly was removed in 4.14. This PR removes the entries from the OCD, ROSA, and ROSA HCP topic maps.

@mburke5678 mburke5678 added this to the Continuous Release milestone Jul 30, 2025
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 30, 2025
@mburke5678 mburke5678 force-pushed the hcm-docs-remove-cgroup-okd branch from 68b1265 to b32b68b Compare July 30, 2025 12:49
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 30, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jul 30, 2025 •
edited
Loading

🤖 Wed Jul 30 13:38:43 - Prow CI generated the docs preview:

https://96849--ocpdocs-pr.netlify.app/

@mburke5678 mburke5678 changed the title HCM remove nodes-cluster-cgroups-okd module HCM remove nodes-cluster-cgroups-okd assembly and module Jul 30, 2025
@mburke5678 mburke5678 force-pushed the hcm-docs-remove-cgroup-okd branch from b32b68b to 1900e44 Compare July 30, 2025 13:12
@openshift-ci openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 30, 2025
@mburke5678 mburke5678 changed the title HCM remove nodes-cluster-cgroups-okd assembly and module HCM remove nodes-cluster-cgroups-okd assembly from topic map Jul 30, 2025
@bmcelvee
Copy link
Contributor

LGTM!

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jul 30, 2025

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

@mburke5678 mburke5678 added the merge-review-needed Signifies that the merge review team needs to review this PR label Jul 30, 2025
lahinson
lahinson reviewed Jul 30, 2025
View reviewed changes
Copy link
Contributor

@lahinson lahinson left a comment

Choose a reason for hiding this comment

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

lgtm

@lahinson lahinson added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Jul 30, 2025
@lahinson lahinson merged commit 20f1d21 into openshift:main Jul 30, 2025
2 checks passed
@lahinson
Copy link
Contributor

/cherrypick enterprise-4.20

@lahinson
Copy link
Contributor

/cherrypick enterprise-4.19

@lahinson
Copy link
Contributor

/cherrypick enterprise-4.18

@lahinson
Copy link
Contributor

/cherrypick enterprise-4.17

@lahinson
Copy link
Contributor

/cherrypick enterprise-4.16

@lahinson
Copy link
Contributor

/cherrypick enterprise-4.15

@lahinson
Copy link
Contributor

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link

@lahinson: new pull request created: #96875

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 openshift-cherrypick-robot mentioned this pull request Jul 30, 2025
Merged
@openshift-cherrypick-robot
Copy link

@lahinson: new pull request created: #96876

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 openshift-cherrypick-robot mentioned this pull request Jul 30, 2025
Merged
@openshift-cherrypick-robot
Copy link

@lahinson: new pull request created: #96877

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 openshift-cherrypick-robot mentioned this pull request Jul 30, 2025
Merged
@openshift-cherrypick-robot
Copy link

@lahinson: new pull request created: #96878

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 openshift-cherrypick-robot mentioned this pull request Jul 30, 2025
Merged
@openshift-cherrypick-robot
Copy link

@lahinson: #96849 failed to apply on top of branch "enterprise-4.16":

Applying: HCM remove nodes-cluster-cgroups-okd module
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	_topic_maps/_topic_map_rosa_hcp.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_maps/_topic_map_rosa_hcp.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa_hcp.yml
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
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 HCM remove nodes-cluster-cgroups-okd module

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.

@openshift-cherrypick-robot
Copy link

@lahinson: #96849 failed to apply on top of branch "enterprise-4.15":

Applying: HCM remove nodes-cluster-cgroups-okd module
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	_topic_maps/_topic_map_rosa_hcp.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_maps/_topic_map_rosa_hcp.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa_hcp.yml
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
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 HCM remove nodes-cluster-cgroups-okd module

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
Copy link

@lahinson: #96849 failed to apply on top of branch "enterprise-4.14":

Applying: HCM remove nodes-cluster-cgroups-okd module
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
A	_topic_maps/_topic_map_rosa_hcp.yml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): _topic_maps/_topic_map_rosa_hcp.yml deleted in HEAD and modified in HCM remove nodes-cluster-cgroups-okd module. Version HCM remove nodes-cluster-cgroups-okd module of _topic_maps/_topic_map_rosa_hcp.yml left in tree.
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
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 HCM remove nodes-cluster-cgroups-okd module

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.

@mburke5678 mburke5678 deleted the hcm-docs-remove-cgroup-okd branch July 30, 2025 17:29
This was referenced Jul 30, 2025
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lahinson lahinson lahinson left review comments

Assignees
No one assigned
Labels
branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 merge-review-in-progress Signifies that the merge review team is reviewing this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.
5 participants
@mburke5678 @ocpdocs-previewbot @bmcelvee @lahinson @openshift-cherrypick-robot