Skip to content

[OSDOCS#16526] automated removal of unused snippet files #100488

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
Oct 21, 2025
Merged

[OSDOCS#16526] automated removal of unused snippet files #100488

merged 1 commit into from
Oct 21, 2025

Conversation

@maxwelldb
Copy link
Contributor

@maxwelldb maxwelldb commented Oct 14, 2025 •
edited
Loading

Version(s): back to 4.14

Issue: https://issues.redhat.com/browse/OSDOCS-16526

Link to docs preview: n/a

QE review:

  • QE has approved this change.

To do:

@maxwelldb maxwelldb self-assigned this Oct 14, 2025
@openshift-ci openshift-ci bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 14, 2025
@maxwelldb maxwelldb force-pushed the remove-unused-snippets branch 2 times, most recently from 9802c26 to ea318bf Compare October 14, 2025 18:06
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 14, 2025 •
edited
Loading

🤖 Tue Oct 21 15:01:43 - Prow CI generated the docs preview:

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

@maxwelldb maxwelldb force-pushed the remove-unused-snippets branch from ea318bf to def1c08 Compare October 14, 2025 18:21
@openshift-ci openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 14, 2025
@maxwelldb maxwelldb changed the title [OSDOCS#TBD] automated removal of unused snippet files [OSDOCS#16526] automated removal of unused snippet files Oct 14, 2025
@maxwelldb maxwelldb added this to the Continuous Release milestone Oct 14, 2025
maxwelldb
maxwelldb commented Oct 14, 2025
View reviewed changes
snippets/developer-preview.adoc
Copy link
Contributor Author

@maxwelldb maxwelldb Oct 14, 2025

Choose a reason for hiding this comment

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

@kalexand-rh @bergerhoffer Thoughts on keeping this?

Copy link
Contributor

@bergerhoffer bergerhoffer Oct 15, 2025

Choose a reason for hiding this comment

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

I think we should keep it

Copy link
Contributor Author

@maxwelldb maxwelldb Oct 21, 2025

Choose a reason for hiding this comment

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

Keeping

michaelryanpeter
michaelryanpeter reviewed Oct 14, 2025
View reviewed changes
Copy link
Contributor

@michaelryanpeter michaelryanpeter left a comment

Choose a reason for hiding this comment

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

I left a comment re: one snippet that is still live in 4.17 and no where else. I'll be removing it soon. The rest, LGTM.

@bergerhoffer
Copy link
Contributor

bergerhoffer commented Oct 20, 2025

The branch/enterprise-4.21 label has been added to this PR.

This is because your PR targets the main branch and is labeled for enterprise-4.20. And any PR going into main must also target the latest version branch (enterprise-4.21).

If the update in your PR does NOT apply to version 4.21 onward, please re-target this PR to go directly into the appropriate version branch or branches (enterprise-4.x) instead of main.

@maxwelldb maxwelldb added the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 20, 2025
@mburke5678
Copy link
Contributor

mburke5678 commented Oct 20, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 20, 2025
@michaelryanpeter
Copy link
Contributor

michaelryanpeter commented Oct 20, 2025

/lgtm
for snippets/olmv1-known-issue-private-registries.adoc, know that this is currently required in 4.17. So you can remove in main, and 4.21-4.18.

@JoeAldinger JoeAldinger 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 Oct 21, 2025
@maxwelldb
Copy link
Contributor Author

maxwelldb commented Oct 21, 2025

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19
/cherry-pick enterprise-4.20
/cherry-pick enterprise-4.21

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 21, 2025

@maxwelldb: once the present PR merges, I will cherry-pick it on top of enterprise-4.14, enterprise-4.15, enterprise-4.16, enterprise-4.18, enterprise-4.19, enterprise-4.20, enterprise-4.21 in new PRs and assign them to you.

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19
/cherry-pick enterprise-4.20
/cherry-pick 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.

@maxwelldb maxwelldb force-pushed the remove-unused-snippets branch from def1c08 to 028b9cc Compare October 21, 2025 14:49
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2025
@openshift-ci
Copy link

openshift-ci bot commented Oct 21, 2025

New changes are detected. LGTM label has been removed.

@maxwelldb
Copy link
Contributor Author

maxwelldb commented Oct 21, 2025

Removed https://github.com/openshift/openshift-docs/pull/100488/files#diff-a5c08db5d987947203bb265914fe5ef97b474938ad43328737356acd7244235f per discussion.

@openshift-ci
Copy link

openshift-ci bot commented Oct 21, 2025

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

@maxwelldb maxwelldb merged commit e6ea543 into openshift:main Oct 21, 2025
2 checks passed
@maxwelldb maxwelldb deleted the remove-unused-snippets branch October 21, 2025 17:52
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 21, 2025

@maxwelldb: #100488 failed to apply on top of branch "enterprise-4.19":

Applying: remove unused snippets - automated
Using index info to reconstruct a base tree...
M	snippets/logging-approval-strategy-snip.adoc
M	snippets/vcenter-support.adoc
Falling back to patching base and 3-way merge...
Removing snippets/ztp-hub-cluster-scale-test-specs.adoc
Removing snippets/ztp-example-siteconfig.adoc
CONFLICT (modify/delete): snippets/vcenter-support.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/vcenter-support.adoc left in tree.
Removing snippets/shieldedvm-baremetal-support.adoc
Removing snippets/rosa-hcp-rn.adoc
Removing snippets/rosa-hcp-not-yet-validated.adoc
Removing snippets/rosa-4-11-12-snippet.adoc
Removing snippets/ptp-clock-holdover-note.adoc
Removing snippets/pgt-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/pg-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/operator-group-unique-name.adoc
Removing snippets/olmv1-version-range-cr-adomn.adoc
Removing snippets/olmv1-secure-registry-pull-secret.adoc
Removing snippets/olmv1-rukpak-does-not-support-fips.adoc
Removing snippets/olmv1-known-issue-service-accounts.adoc
Removing snippets/olmv1-known-issue-private-registries.adoc
Removing snippets/oadp-ceph-cr-prerequisites.adoc
Removing snippets/nodes-cgroup-vi-removed.adoc
Removing snippets/network-observability-clusterrolebinding.adoc
Removing snippets/network-observability-clusterrole-writer.adoc
Removing snippets/network-observability-clusterrole-reader.adoc
Removing snippets/logging-subscription-object-snip.adoc
Removing snippets/logging-restructure-snip.adoc
Removing snippets/logging-outputs-5.6-snip.adoc
Removing snippets/logging-outputs-5.5-snip.adoc
Removing snippets/logging-loki-vs-lokistack-snip.adoc
Removing snippets/logging-log-types-snip.adoc
Removing snippets/logging-get-clusterid-snip.adoc
Removing snippets/logging-create-secret-snip.adoc
CONFLICT (modify/delete): snippets/logging-approval-strategy-snip.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/logging-approval-strategy-snip.adoc left in tree.
Removing snippets/imp-rosa-hcp-no-shared-vpc-support.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 remove unused snippets - automated

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19
/cherry-pick enterprise-4.20
/cherry-pick 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

openshift-cherrypick-robot commented Oct 21, 2025

@maxwelldb: #100488 failed to apply on top of branch "enterprise-4.20":

Applying: remove unused snippets - automated
Using index info to reconstruct a base tree...
M	snippets/logging-approval-strategy-snip.adoc
Falling back to patching base and 3-way merge...
Removing snippets/ztp-hub-cluster-scale-test-specs.adoc
Removing snippets/ztp-example-siteconfig.adoc
Removing snippets/vcenter-support.adoc
Removing snippets/shieldedvm-baremetal-support.adoc
Removing snippets/rosa-hcp-rn.adoc
Removing snippets/rosa-hcp-not-yet-validated.adoc
Removing snippets/rosa-4-11-12-snippet.adoc
Removing snippets/ptp-clock-holdover-note.adoc
Removing snippets/pgt-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/pg-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/operator-group-unique-name.adoc
Removing snippets/olmv1-version-range-cr-adomn.adoc
Removing snippets/olmv1-secure-registry-pull-secret.adoc
Removing snippets/olmv1-rukpak-does-not-support-fips.adoc
Removing snippets/olmv1-known-issue-service-accounts.adoc
Removing snippets/olmv1-known-issue-private-registries.adoc
Removing snippets/oadp-ceph-cr-prerequisites.adoc
Removing snippets/nodes-cgroup-vi-removed.adoc
Removing snippets/network-observability-clusterrolebinding.adoc
Removing snippets/network-observability-clusterrole-writer.adoc
Removing snippets/network-observability-clusterrole-reader.adoc
Removing snippets/logging-subscription-object-snip.adoc
Removing snippets/logging-restructure-snip.adoc
Removing snippets/logging-outputs-5.6-snip.adoc
Removing snippets/logging-outputs-5.5-snip.adoc
Removing snippets/logging-loki-vs-lokistack-snip.adoc
Removing snippets/logging-log-types-snip.adoc
Removing snippets/logging-get-clusterid-snip.adoc
Removing snippets/logging-create-secret-snip.adoc
CONFLICT (modify/delete): snippets/logging-approval-strategy-snip.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/logging-approval-strategy-snip.adoc left in tree.
Removing snippets/imp-rosa-hcp-no-shared-vpc-support.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 remove unused snippets - automated

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19
/cherry-pick enterprise-4.20
/cherry-pick 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

openshift-cherrypick-robot commented Oct 21, 2025

@maxwelldb: #100488 failed to apply on top of branch "enterprise-4.21":

Applying: remove unused snippets - automated
Using index info to reconstruct a base tree...
M	snippets/logging-approval-strategy-snip.adoc
Falling back to patching base and 3-way merge...
Removing snippets/ztp-hub-cluster-scale-test-specs.adoc
Removing snippets/ztp-example-siteconfig.adoc
Removing snippets/vcenter-support.adoc
Removing snippets/shieldedvm-baremetal-support.adoc
Removing snippets/rosa-hcp-rn.adoc
Removing snippets/rosa-hcp-not-yet-validated.adoc
Removing snippets/rosa-4-11-12-snippet.adoc
Removing snippets/ptp-clock-holdover-note.adoc
Removing snippets/pgt-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/pg-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/operator-group-unique-name.adoc
Removing snippets/olmv1-version-range-cr-adomn.adoc
Removing snippets/olmv1-secure-registry-pull-secret.adoc
Removing snippets/olmv1-rukpak-does-not-support-fips.adoc
Removing snippets/olmv1-known-issue-service-accounts.adoc
Removing snippets/olmv1-known-issue-private-registries.adoc
Removing snippets/oadp-ceph-cr-prerequisites.adoc
Removing snippets/nodes-cgroup-vi-removed.adoc
Removing snippets/network-observability-clusterrolebinding.adoc
Removing snippets/network-observability-clusterrole-writer.adoc
Removing snippets/network-observability-clusterrole-reader.adoc
Removing snippets/logging-subscription-object-snip.adoc
Removing snippets/logging-restructure-snip.adoc
Removing snippets/logging-outputs-5.6-snip.adoc
Removing snippets/logging-outputs-5.5-snip.adoc
Removing snippets/logging-loki-vs-lokistack-snip.adoc
Removing snippets/logging-log-types-snip.adoc
Removing snippets/logging-get-clusterid-snip.adoc
Removing snippets/logging-create-secret-snip.adoc
CONFLICT (modify/delete): snippets/logging-approval-strategy-snip.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/logging-approval-strategy-snip.adoc left in tree.
Removing snippets/imp-rosa-hcp-no-shared-vpc-support.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 remove unused snippets - automated

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19
/cherry-pick enterprise-4.20
/cherry-pick 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

openshift-cherrypick-robot commented Oct 21, 2025

@maxwelldb: #100488 failed to apply on top of branch "enterprise-4.14":

Applying: remove unused snippets - automated
Using index info to reconstruct a base tree...
A	snippets/imp-rosa-hcp-no-shared-vpc-support.adoc
M	snippets/logging-approval-strategy-snip.adoc
A	snippets/nodes-cgroup-vi-removed.adoc
A	snippets/olmv1-known-issue-private-registries.adoc
A	snippets/olmv1-known-issue-service-accounts.adoc
A	snippets/olmv1-rukpak-does-not-support-fips.adoc
A	snippets/olmv1-secure-registry-pull-secret.adoc
A	snippets/olmv1-version-range-cr-adomn.adoc
M	snippets/operator-group-unique-name.adoc
A	snippets/pg-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
A	snippets/pgt-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
A	snippets/rosa-hcp-not-yet-validated.adoc
M	snippets/rosa-hcp-rn.adoc
A	snippets/shieldedvm-baremetal-support.adoc
M	snippets/vcenter-support.adoc
Falling back to patching base and 3-way merge...
Removing snippets/ztp-hub-cluster-scale-test-specs.adoc
Removing snippets/ztp-example-siteconfig.adoc
CONFLICT (modify/delete): snippets/vcenter-support.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/vcenter-support.adoc left in tree.
CONFLICT (modify/delete): snippets/rosa-hcp-rn.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/rosa-hcp-rn.adoc left in tree.
CONFLICT (rename/delete): snippets/shieldedvm-baremetal-support.adoc deleted in remove unused snippets - automated and renamed to snippets/rosa-classic-support.adoc in HEAD. Version HEAD of snippets/rosa-classic-support.adoc left in tree.
Removing snippets/rosa-4-11-12-snippet.adoc
Removing snippets/ptp-clock-holdover-note.adoc
CONFLICT (modify/delete): snippets/operator-group-unique-name.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/operator-group-unique-name.adoc left in tree.
Removing snippets/oadp-ceph-cr-prerequisites.adoc
Removing snippets/network-observability-clusterrolebinding.adoc
Removing snippets/network-observability-clusterrole-writer.adoc
Removing snippets/network-observability-clusterrole-reader.adoc
Removing snippets/logging-subscription-object-snip.adoc
Removing snippets/logging-restructure-snip.adoc
Removing snippets/logging-outputs-5.6-snip.adoc
Removing snippets/logging-outputs-5.5-snip.adoc
Removing snippets/logging-loki-vs-lokistack-snip.adoc
Removing snippets/logging-log-types-snip.adoc
Removing snippets/logging-get-clusterid-snip.adoc
Removing snippets/logging-create-secret-snip.adoc
CONFLICT (modify/delete): snippets/logging-approval-strategy-snip.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/logging-approval-strategy-snip.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 remove unused snippets - automated

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19
/cherry-pick enterprise-4.20
/cherry-pick 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

openshift-cherrypick-robot commented Oct 21, 2025

@maxwelldb: #100488 failed to apply on top of branch "enterprise-4.15":

Applying: remove unused snippets - automated
Using index info to reconstruct a base tree...
M	snippets/logging-approval-strategy-snip.adoc
A	snippets/nodes-cgroup-vi-removed.adoc
A	snippets/olmv1-known-issue-private-registries.adoc
A	snippets/olmv1-known-issue-service-accounts.adoc
A	snippets/olmv1-rukpak-does-not-support-fips.adoc
M	snippets/olmv1-secure-registry-pull-secret.adoc
A	snippets/pg-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
A	snippets/pgt-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
A	snippets/rosa-hcp-not-yet-validated.adoc
M	snippets/rosa-hcp-rn.adoc
A	snippets/shieldedvm-baremetal-support.adoc
M	snippets/vcenter-support.adoc
Falling back to patching base and 3-way merge...
Removing snippets/ztp-hub-cluster-scale-test-specs.adoc
Removing snippets/ztp-example-siteconfig.adoc
CONFLICT (modify/delete): snippets/vcenter-support.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/vcenter-support.adoc left in tree.
CONFLICT (modify/delete): snippets/rosa-hcp-rn.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/rosa-hcp-rn.adoc left in tree.
CONFLICT (rename/delete): snippets/shieldedvm-baremetal-support.adoc deleted in remove unused snippets - automated and renamed to snippets/rosa-classic-support.adoc in HEAD. Version HEAD of snippets/rosa-classic-support.adoc left in tree.
Removing snippets/rosa-4-11-12-snippet.adoc
Removing snippets/ptp-clock-holdover-note.adoc
Removing snippets/operator-group-unique-name.adoc
Removing snippets/olmv1-version-range-cr-adomn.adoc
CONFLICT (modify/delete): snippets/olmv1-secure-registry-pull-secret.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/olmv1-secure-registry-pull-secret.adoc left in tree.
Removing snippets/oadp-ceph-cr-prerequisites.adoc
Removing snippets/network-observability-clusterrolebinding.adoc
Removing snippets/network-observability-clusterrole-writer.adoc
Removing snippets/network-observability-clusterrole-reader.adoc
Removing snippets/logging-subscription-object-snip.adoc
Removing snippets/logging-restructure-snip.adoc
Removing snippets/logging-outputs-5.6-snip.adoc
Removing snippets/logging-outputs-5.5-snip.adoc
Removing snippets/logging-loki-vs-lokistack-snip.adoc
Removing snippets/logging-log-types-snip.adoc
Removing snippets/logging-get-clusterid-snip.adoc
Removing snippets/logging-create-secret-snip.adoc
CONFLICT (modify/delete): snippets/logging-approval-strategy-snip.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/logging-approval-strategy-snip.adoc left in tree.
Removing snippets/imp-rosa-hcp-no-shared-vpc-support.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 remove unused snippets - automated

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19
/cherry-pick enterprise-4.20
/cherry-pick 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

openshift-cherrypick-robot commented Oct 21, 2025

@maxwelldb: #100488 failed to apply on top of branch "enterprise-4.16":

Applying: remove unused snippets - automated
Using index info to reconstruct a base tree...
M	snippets/logging-approval-strategy-snip.adoc
A	snippets/nodes-cgroup-vi-removed.adoc
A	snippets/olmv1-known-issue-private-registries.adoc
A	snippets/olmv1-known-issue-service-accounts.adoc
M	snippets/olmv1-secure-registry-pull-secret.adoc
A	snippets/rosa-hcp-not-yet-validated.adoc
M	snippets/rosa-hcp-rn.adoc
A	snippets/shieldedvm-baremetal-support.adoc
M	snippets/vcenter-support.adoc
Falling back to patching base and 3-way merge...
Removing snippets/ztp-hub-cluster-scale-test-specs.adoc
Removing snippets/ztp-example-siteconfig.adoc
CONFLICT (modify/delete): snippets/vcenter-support.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/vcenter-support.adoc left in tree.
CONFLICT (modify/delete): snippets/rosa-hcp-rn.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/rosa-hcp-rn.adoc left in tree.
CONFLICT (rename/delete): snippets/shieldedvm-baremetal-support.adoc deleted in remove unused snippets - automated and renamed to snippets/rosa-classic-support.adoc in HEAD. Version HEAD of snippets/rosa-classic-support.adoc left in tree.
Removing snippets/rosa-4-11-12-snippet.adoc
Removing snippets/ptp-clock-holdover-note.adoc
Removing snippets/pgt-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/pg-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/operator-group-unique-name.adoc
Removing snippets/olmv1-version-range-cr-adomn.adoc
CONFLICT (modify/delete): snippets/olmv1-secure-registry-pull-secret.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/olmv1-secure-registry-pull-secret.adoc left in tree.
Removing snippets/olmv1-rukpak-does-not-support-fips.adoc
Removing snippets/oadp-ceph-cr-prerequisites.adoc
Removing snippets/network-observability-clusterrolebinding.adoc
Removing snippets/network-observability-clusterrole-writer.adoc
Removing snippets/network-observability-clusterrole-reader.adoc
Removing snippets/logging-subscription-object-snip.adoc
Removing snippets/logging-restructure-snip.adoc
Removing snippets/logging-outputs-5.6-snip.adoc
Removing snippets/logging-outputs-5.5-snip.adoc
Removing snippets/logging-loki-vs-lokistack-snip.adoc
Removing snippets/logging-log-types-snip.adoc
Removing snippets/logging-get-clusterid-snip.adoc
Removing snippets/logging-create-secret-snip.adoc
CONFLICT (modify/delete): snippets/logging-approval-strategy-snip.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/logging-approval-strategy-snip.adoc left in tree.
Removing snippets/imp-rosa-hcp-no-shared-vpc-support.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 remove unused snippets - automated

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19
/cherry-pick enterprise-4.20
/cherry-pick 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

openshift-cherrypick-robot commented Oct 21, 2025

@maxwelldb: #100488 failed to apply on top of branch "enterprise-4.18":

Applying: remove unused snippets - automated
Using index info to reconstruct a base tree...
M	snippets/logging-approval-strategy-snip.adoc
A	snippets/nodes-cgroup-vi-removed.adoc
A	snippets/rosa-hcp-not-yet-validated.adoc
M	snippets/rosa-hcp-rn.adoc
A	snippets/shieldedvm-baremetal-support.adoc
M	snippets/vcenter-support.adoc
Falling back to patching base and 3-way merge...
Removing snippets/ztp-hub-cluster-scale-test-specs.adoc
Removing snippets/ztp-example-siteconfig.adoc
CONFLICT (modify/delete): snippets/vcenter-support.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/vcenter-support.adoc left in tree.
CONFLICT (modify/delete): snippets/rosa-hcp-rn.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/rosa-hcp-rn.adoc left in tree.
CONFLICT (rename/delete): snippets/shieldedvm-baremetal-support.adoc deleted in remove unused snippets - automated and renamed to snippets/rosa-classic-support.adoc in HEAD. Version HEAD of snippets/rosa-classic-support.adoc left in tree.
Removing snippets/rosa-4-11-12-snippet.adoc
Removing snippets/ptp-clock-holdover-note.adoc
Removing snippets/pgt-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/pg-ztp-configuring-hwevents-using-pgt-hardware-event.adoc
Removing snippets/operator-group-unique-name.adoc
Removing snippets/olmv1-version-range-cr-adomn.adoc
Removing snippets/olmv1-secure-registry-pull-secret.adoc
Removing snippets/olmv1-rukpak-does-not-support-fips.adoc
Removing snippets/olmv1-known-issue-service-accounts.adoc
Removing snippets/olmv1-known-issue-private-registries.adoc
Removing snippets/oadp-ceph-cr-prerequisites.adoc
Removing snippets/network-observability-clusterrolebinding.adoc
Removing snippets/network-observability-clusterrole-writer.adoc
Removing snippets/network-observability-clusterrole-reader.adoc
Removing snippets/logging-subscription-object-snip.adoc
Removing snippets/logging-restructure-snip.adoc
Removing snippets/logging-outputs-5.6-snip.adoc
Removing snippets/logging-outputs-5.5-snip.adoc
Removing snippets/logging-loki-vs-lokistack-snip.adoc
Removing snippets/logging-log-types-snip.adoc
Removing snippets/logging-get-clusterid-snip.adoc
Removing snippets/logging-create-secret-snip.adoc
CONFLICT (modify/delete): snippets/logging-approval-strategy-snip.adoc deleted in remove unused snippets - automated and modified in HEAD. Version HEAD of snippets/logging-approval-strategy-snip.adoc left in tree.
Removing snippets/imp-rosa-hcp-no-shared-vpc-support.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 remove unused snippets - automated

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19
/cherry-pick enterprise-4.20
/cherry-pick 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.

This was referenced Oct 21, 2025
Merged
Merged
Merged
Merged
Merged
Merged
Merged
@bergerhoffer
Copy link
Contributor

bergerhoffer commented Oct 28, 2025

@maxwelldb It looks like this wasn't cherry picked to 4.21 - can you please do so if it wasn't taken care of another way?

@maxwelldb maxwelldb mentioned this pull request Oct 28, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bergerhoffer bergerhoffer bergerhoffer left review comments

@michaelryanpeter michaelryanpeter michaelryanpeter left review comments

@JoeAldinger JoeAldinger JoeAldinger approved these changes

Assignees

@mburke5678 mburke5678

@maxwelldb maxwelldb

@michaelryanpeter michaelryanpeter

Labels

branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 merge-review-in-progress Signifies that the merge review team is reviewing this PR size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Milestone

Continuous Release

Development

Successfully merging this pull request may close these issues.

7 participants

@maxwelldb @ocpdocs-previewbot @bergerhoffer @mburke5678 @michaelryanpeter @openshift-cherrypick-robot @JoeAldinger