Skip to content

Conversation

@bergerhoffer bergerhoffer added this to the Continuous Release milestone Oct 1, 2025
@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 1, 2025
@bergerhoffer
Copy link
Contributor Author

/retest

@ocpdocs-previewbot
Copy link

🤖 Thu Oct 02 13:23:28 - Prow CI generated the docs preview:
https://99927--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci
Copy link

openshift-ci bot commented Oct 2, 2025

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

@bergerhoffer
Copy link
Contributor Author

/label merge-review-needed

I can merge after the merge review, because I know this will require manual CPs.

Please only worry about the changed content (typos) and not any other vale hits, etc.

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 2, 2025
@mburke5678 mburke5678 added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Oct 3, 2025
@mburke5678
Copy link
Contributor

/lgtm

@mburke5678 mburke5678 removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Oct 3, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 3, 2025
@bergerhoffer bergerhoffer merged commit 288cefe into openshift:main Oct 6, 2025
2 checks passed
@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.20

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.19

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@bergerhoffer: #99927 failed to apply on top of branch "enterprise-4.20":

Applying: Fixing some typos
.git/rebase-apply/patch:94: trailing whitespace.
The images are stored in the `/etc/crio/crio.conf.d/50-pinned-images` file on the nodes. 
.git/rebase-apply/patch:309: trailing whitespace.
Namespace-scoped network policy:: Application developers and namespace tenants can use the `NetworkPolicy` API to define network policy rules for a specific namespace. Rules in the `NetworkPolicy` for a namespace take precedence over cluster-wide rules configured using the BaselineAdminNetworkPolicy API, or for a cluster-wide rule that has been delegated or "passed" from the cluster-wide `AdminNetworkPolicy` API. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	networking/network_security/network-policy-apis.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/network_security/network-policy-apis.adoc
CONFLICT (content): Merge conflict in networking/network_security/network-policy-apis.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 Fixing some typos

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

@bergerhoffer: #99927 failed to apply on top of branch "enterprise-4.19":

Applying: Fixing some typos
.git/rebase-apply/patch:94: trailing whitespace.
The images are stored in the `/etc/crio/crio.conf.d/50-pinned-images` file on the nodes. 
.git/rebase-apply/patch:309: trailing whitespace.
Namespace-scoped network policy:: Application developers and namespace tenants can use the `NetworkPolicy` API to define network policy rules for a specific namespace. Rules in the `NetworkPolicy` for a namespace take precedence over cluster-wide rules configured using the BaselineAdminNetworkPolicy API, or for a cluster-wide rule that has been delegated or "passed" from the cluster-wide `AdminNetworkPolicy` API. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	hosted_control_planes/hosted-control-planes-release-notes.adoc
M	modules/machine-config-pin-preload-images.adoc
M	networking/network_security/network-policy-apis.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/network_security/network-policy-apis.adoc
CONFLICT (content): Merge conflict in networking/network_security/network-policy-apis.adoc
Auto-merging modules/machine-config-pin-preload-images.adoc
Auto-merging hosted_control_planes/hosted-control-planes-release-notes.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 Fixing some typos

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

@bergerhoffer: #99927 failed to apply on top of branch "enterprise-4.18":

Applying: Fixing some typos
.git/rebase-apply/patch:94: trailing whitespace.
The images are stored in the `/etc/crio/crio.conf.d/50-pinned-images` file on the nodes. 
.git/rebase-apply/patch:309: trailing whitespace.
Namespace-scoped network policy:: Application developers and namespace tenants can use the `NetworkPolicy` API to define network policy rules for a specific namespace. Rules in the `NetworkPolicy` for a namespace take precedence over cluster-wide rules configured using the BaselineAdminNetworkPolicy API, or for a cluster-wide rule that has been delegated or "passed" from the cluster-wide `AdminNetworkPolicy` API. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	hosted_control_planes/hosted-control-planes-release-notes.adoc
M	modules/coo-troubleshooting-ui-plugin-using.adoc
M	modules/dr-restoring-cluster-state.adoc
A	modules/machine-config-pin-preload-images.adoc
A	modules/microshift-verify-container-signatures-sigstore.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
M	modules/persistent-storage-csi-drivers-supported.adoc
M	modules/rosa-sdpolicy-platform.adoc
A	modules/virt-creating-fusionaccess-cr.adoc
M	networking/network_security/network-policy-apis.adoc
M	rosa_release_notes/rosa-release-notes.adoc
M	security/zero_trust_workload_identity_manager/zero-trust-manager-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging security/zero_trust_workload_identity_manager/zero-trust-manager-release-notes.adoc
CONFLICT (content): Merge conflict in security/zero_trust_workload_identity_manager/zero-trust-manager-release-notes.adoc
Auto-merging rosa_release_notes/rosa-release-notes.adoc
CONFLICT (content): Merge conflict in rosa_release_notes/rosa-release-notes.adoc
Auto-merging networking/network_security/network-policy-apis.adoc
CONFLICT (content): Merge conflict in networking/network_security/network-policy-apis.adoc
CONFLICT (modify/delete): modules/virt-creating-fusionaccess-cr.adoc deleted in HEAD and modified in Fixing some typos. Version Fixing some typos of modules/virt-creating-fusionaccess-cr.adoc left in tree.
Auto-merging modules/rosa-sdpolicy-platform.adoc
CONFLICT (content): Merge conflict in modules/rosa-sdpolicy-platform.adoc
Auto-merging modules/persistent-storage-csi-drivers-supported.adoc
CONFLICT (content): Merge conflict in modules/persistent-storage-csi-drivers-supported.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
CONFLICT (modify/delete): modules/microshift-verify-container-signatures-sigstore.adoc deleted in HEAD and modified in Fixing some typos. Version Fixing some typos of modules/microshift-verify-container-signatures-sigstore.adoc left in tree.
CONFLICT (modify/delete): modules/machine-config-pin-preload-images.adoc deleted in HEAD and modified in Fixing some typos. Version Fixing some typos of modules/machine-config-pin-preload-images.adoc left in tree.
Auto-merging modules/dr-restoring-cluster-state.adoc
Auto-merging modules/coo-troubleshooting-ui-plugin-using.adoc
CONFLICT (content): Merge conflict in modules/coo-troubleshooting-ui-plugin-using.adoc
Auto-merging hosted_control_planes/hosted-control-planes-release-notes.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hosted-control-planes-release-notes.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 Fixing some typos

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jldohmann @ShaunaDiaz It looks like the Vale rule for discrete headings didn't fire for this file. Any thoughts on why it didn't catch this?

@bergerhoffer
Copy link
Contributor Author

4.20 didn't CP cleanly, but it's due to a discrete heading that wasn't removed in main, but was in 4.20 and back. Will update to fix main in a future PR.

Namespace-scoped network policy:: Application developers and namespace tenants can use the `NetworkPolicy` API to define network policy rules for a specific namespace. Rules in the `NetworkPolicy` for a namespace take precedence over cluster-wide rules configured using the BaselineAdminNetworkPolicy API, or for a cluster-wide rule that that has been delegated or "passed" from the cluster-wide `AdminNetworkPolicy` API.
Namespace-scoped network policy:: Application developers and namespace tenants can use the `NetworkPolicy` API to define network policy rules for a specific namespace. Rules in the `NetworkPolicy` for a namespace take precedence over cluster-wide rules configured using the BaselineAdminNetworkPolicy API, or for a cluster-wide rule that has been delegated or "passed" from the cluster-wide `AdminNetworkPolicy` API.

[discrete]
Copy link
Contributor

Choose a reason for hiding this comment

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

@bergerhoffer do you mean here? it's not a part of the git diff, so the CI will not check against it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jldohmann I do. Lines 11 and 22.

I thought it would check on the whole file. Does it really only check against lines you change?

Copy link
Contributor

Choose a reason for hiding this comment

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

vale will run on the whole file, but the output gets filtered using git diff and this determines which alerts gets commented on PRs: if an alert is determined to be outside of the modified file changes, it is discarded

Copy link
Contributor

Choose a reason for hiding this comment

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

i'm uncertain if changing things so that all alerts are reflected in PR comments is possible, based on the GH API the prow script uses: there's a comment that says the GH API only accepts comments within the diff for the review comments endpoint

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I'm not saying we need to change it. I just want to make sure I understand exactly what it's doing so that we can make sure everyone else is aware as well. For some reason, I thought I had made a change to a file elsewhere and it picked something up. I'll check back through my test PRs to see if I can find what I'm talking about. Thanks!

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.

6 participants