Skip to content

Conversation

@JoeAldinger
Copy link
Contributor

@JoeAldinger JoeAldinger commented Oct 28, 2025

xref: #99819
cherry picked from: 27ee13a

Version(s):
4.16

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

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 28, 2025
@openshift-ci
Copy link

openshift-ci bot commented Oct 28, 2025

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

@JoeAldinger JoeAldinger changed the title OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetw… [enterprise-4.16] OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetw… Oct 29, 2025
@JoeAldinger JoeAldinger added this to the Continuous Release milestone Oct 29, 2025
@JoeAldinger JoeAldinger merged commit 0bbbd21 into openshift:enterprise-4.16 Oct 29, 2025
2 checks passed
@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.15

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.14

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@JoeAldinger: #101240 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy
Using index info to reconstruct a base tree...
A	modules/nw-coredns-egress-firewall.adoc
M	modules/nw-egressnetworkpolicy-about.adoc
M	modules/nw-egressnetworkpolicy-create.adoc
M	modules/nw-egressnetworkpolicy-object.adoc
M	modules/nw-egressnetworkpolicy-view.adoc
A	networking/network_security/egress_firewall/configuring-egress-firewall-ovn.adoc
A	networking/network_security/egress_firewall/editing-egress-firewall-ovn.adoc
A	networking/network_security/egress_firewall/removing-egress-firewall-ovn.adoc
A	networking/network_security/egress_firewall/viewing-egress-firewall-ovn.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/ovn_kubernetes_network_provider/configuring-egress-firewall-ovn.adoc
CONFLICT (content): Merge conflict in networking/ovn_kubernetes_network_provider/configuring-egress-firewall-ovn.adoc
Auto-merging modules/nw-egressnetworkpolicy-view.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-view.adoc
Auto-merging modules/nw-egressnetworkpolicy-object.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-object.adoc
Auto-merging modules/nw-egressnetworkpolicy-create.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-create.adoc
Auto-merging modules/nw-egressnetworkpolicy-about.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-about.adoc
CONFLICT (modify/delete): modules/nw-coredns-egress-firewall.adoc deleted in HEAD and modified in OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy. Version OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy of modules/nw-coredns-egress-firewall.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-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy

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

@JoeAldinger: #101240 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy
Using index info to reconstruct a base tree...
A	modules/nw-coredns-egress-firewall.adoc
M	modules/nw-egressnetworkpolicy-about.adoc
M	modules/nw-egressnetworkpolicy-create.adoc
M	modules/nw-egressnetworkpolicy-object.adoc
M	modules/nw-egressnetworkpolicy-view.adoc
A	networking/network_security/egress_firewall/configuring-egress-firewall-ovn.adoc
A	networking/network_security/egress_firewall/editing-egress-firewall-ovn.adoc
A	networking/network_security/egress_firewall/removing-egress-firewall-ovn.adoc
A	networking/network_security/egress_firewall/viewing-egress-firewall-ovn.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/ovn_kubernetes_network_provider/viewing-egress-firewall-ovn.adoc
Auto-merging networking/ovn_kubernetes_network_provider/configuring-egress-firewall-ovn.adoc
CONFLICT (content): Merge conflict in networking/ovn_kubernetes_network_provider/configuring-egress-firewall-ovn.adoc
Auto-merging modules/nw-egressnetworkpolicy-view.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-view.adoc
Auto-merging modules/nw-egressnetworkpolicy-object.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-object.adoc
Auto-merging modules/nw-egressnetworkpolicy-create.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-create.adoc
Auto-merging modules/nw-egressnetworkpolicy-about.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-about.adoc
CONFLICT (modify/delete): modules/nw-coredns-egress-firewall.adoc deleted in HEAD and modified in OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy. Version OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy of modules/nw-coredns-egress-firewall.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-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy

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

@JoeAldinger: #101240 failed to apply on top of branch "enterprise-4.13":

Applying: OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy
Using index info to reconstruct a base tree...
A	modules/nw-coredns-egress-firewall.adoc
M	modules/nw-egressnetworkpolicy-about.adoc
M	modules/nw-egressnetworkpolicy-create.adoc
M	modules/nw-egressnetworkpolicy-object.adoc
M	modules/nw-egressnetworkpolicy-view.adoc
A	networking/network_security/egress_firewall/configuring-egress-firewall-ovn.adoc
A	networking/network_security/egress_firewall/editing-egress-firewall-ovn.adoc
A	networking/network_security/egress_firewall/removing-egress-firewall-ovn.adoc
A	networking/network_security/egress_firewall/viewing-egress-firewall-ovn.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/ovn_kubernetes_network_provider/viewing-egress-firewall-ovn.adoc
Auto-merging networking/ovn_kubernetes_network_provider/configuring-egress-firewall-ovn.adoc
CONFLICT (content): Merge conflict in networking/ovn_kubernetes_network_provider/configuring-egress-firewall-ovn.adoc
Auto-merging modules/nw-egressnetworkpolicy-view.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-view.adoc
Auto-merging modules/nw-egressnetworkpolicy-object.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-object.adoc
Auto-merging modules/nw-egressnetworkpolicy-create.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-create.adoc
Auto-merging modules/nw-egressnetworkpolicy-about.adoc
CONFLICT (content): Merge conflict in modules/nw-egressnetworkpolicy-about.adoc
CONFLICT (modify/delete): modules/nw-coredns-egress-firewall.adoc deleted in HEAD and modified in OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy. Version OSDOCS-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy of modules/nw-coredns-egress-firewall.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-13364-egfw:separates OVN-K egress firewall from SDN egressnetworkpolicy

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.

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

Labels

branch/enterprise-4.16 size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants