OCPBUGS#49997: Enhanced the info for the k8s.v1.cni.cncf.io/policy-fo…

[dfitzmau]

Version(s):
4.12+

Issue:
OCPBUGS-49997

Link to docs preview:

• Compatibility with multi-network policy
• Differences between multi-network policy and network policy

• SME has approved this change (Miguel Barroso).
• QE has approved this change (Weibin Liang).

[openshift-ci-robot]

@dfitzmau: This pull request references Jira Issue OCPBUGS-49997, which is invalid:

• expected the bug to target the "4.20.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Version(s):
4.12+

Issue:
OCPBUGS-49997

Link to docs preview:

• SME has approved this change.
• QE has approved this change.

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 openshift-eng/jira-lifecycle-plugin repository.

[ocpdocs-previewbot]

🤖 Tue Jul 15 15:32:45 - Prow CI generated the docs preview:

https://95148--ocpdocs-pr.netlify.app/
https://95148--ocpdocs-pr.netlify.app/microshift/latest/microshift_networking/microshift_network_policy/microshift-creating-network-policy.html
https://95148--ocpdocs-pr.netlify.app/openshift-dedicated/latest/networking/network_security/network_policy/creating-network-policy.html
https://95148--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/multiple_networks/secondary_networks/configuring-multi-network-policy.html
https://95148--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/multiple_networks/secondary_networks/creating-secondary-nwt-ovnk.html
https://95148--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/network_security/network_policy/creating-network-policy.html
https://95148--ocpdocs-pr.netlify.app/openshift-rosa/latest/networking/network_security/network_policy/creating-network-policy.html

[openshift-ci-robot]

@dfitzmau: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

Version(s):
4.12+

Issue:
OCPBUGS-49997

Link to docs preview:

• Compatibility with multi-network policy

• SME has approved this change.
• QE has approved this change.

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 openshift-eng/jira-lifecycle-plugin repository.

[weliang1]

/lgtm

[openshift-ci]

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

[dfitzmau]

/cherrypick enterprise-4.20

[dfitzmau]

/cherrypick enterprise-4.19

[dfitzmau]

/cherrypick enterprise-4.18

[dfitzmau]

/cherrypick enterprise-4.17

[dfitzmau]

/cherrypick enterprise-4.16

[dfitzmau]

/cherrypick enterprise-4.15

[dfitzmau]

/cherrypick enterprise-4.14

[dfitzmau]

/cherrypick enterprise-4.13

[dfitzmau]

/cherrypick enterprise-4.12

[openshift-cherrypick-robot]

@dfitzmau: new pull request created: #96111

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]

@dfitzmau: new pull request created: #96112

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]

@dfitzmau: new pull request created: #96113

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]

@dfitzmau: #95148 failed to apply on top of branch "enterprise-4.17":

Applying: OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation
Using index info to reconstruct a base tree...
M	modules/nw-multi-network-policy-differences.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-multi-network-policy-differences.adoc
CONFLICT (content): Merge conflict in modules/nw-multi-network-policy-differences.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 OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation

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]

@dfitzmau: #95148 failed to apply on top of branch "enterprise-4.16":

Applying: OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation
Using index info to reconstruct a base tree...
M	modules/configuration-ovnk-multi-network-policy.adoc
M	modules/nw-multi-network-policy-differences.adoc
M	modules/nw-networkpolicy-allow-application-all-namespaces.adoc
M	modules/nw-networkpolicy-allow-application-particular-namespace.adoc
M	modules/nw-networkpolicy-allow-external-clients.adoc
M	modules/nw-networkpolicy-create-cli.adoc
M	modules/nw-networkpolicy-deny-all-allowed.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-networkpolicy-deny-all-allowed.adoc
Auto-merging modules/nw-networkpolicy-create-cli.adoc
Auto-merging modules/nw-networkpolicy-allow-external-clients.adoc
Auto-merging modules/nw-networkpolicy-allow-application-particular-namespace.adoc
Auto-merging modules/nw-networkpolicy-allow-application-all-namespaces.adoc
Auto-merging modules/nw-multi-network-policy-differences.adoc
CONFLICT (content): Merge conflict in modules/nw-multi-network-policy-differences.adoc
Auto-merging modules/configuration-ovnk-multi-network-policy.adoc
CONFLICT (content): Merge conflict in modules/configuration-ovnk-multi-network-policy.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 OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation

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]

@dfitzmau: #95148 failed to apply on top of branch "enterprise-4.15":

Applying: OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation
Using index info to reconstruct a base tree...
M	modules/configuration-ovnk-multi-network-policy.adoc
M	modules/nw-multi-network-policy-differences.adoc
M	modules/nw-networkpolicy-allow-application-all-namespaces.adoc
M	modules/nw-networkpolicy-allow-application-particular-namespace.adoc
M	modules/nw-networkpolicy-allow-external-clients.adoc
M	modules/nw-networkpolicy-create-cli.adoc
M	modules/nw-networkpolicy-deny-all-allowed.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-networkpolicy-deny-all-allowed.adoc
CONFLICT (content): Merge conflict in modules/nw-networkpolicy-deny-all-allowed.adoc
Auto-merging modules/nw-networkpolicy-create-cli.adoc
Auto-merging modules/nw-networkpolicy-allow-external-clients.adoc
Auto-merging modules/nw-networkpolicy-allow-application-particular-namespace.adoc
Auto-merging modules/nw-networkpolicy-allow-application-all-namespaces.adoc
Auto-merging modules/nw-multi-network-policy-differences.adoc
CONFLICT (content): Merge conflict in modules/nw-multi-network-policy-differences.adoc
Auto-merging modules/configuration-ovnk-multi-network-policy.adoc
CONFLICT (content): Merge conflict in modules/configuration-ovnk-multi-network-policy.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 OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation

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]

@dfitzmau: #95148 failed to apply on top of branch "enterprise-4.14":

Applying: OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation
Using index info to reconstruct a base tree...
M	modules/configuration-ovnk-multi-network-policy.adoc
M	modules/nw-multi-network-policy-differences.adoc
M	modules/nw-networkpolicy-allow-application-all-namespaces.adoc
M	modules/nw-networkpolicy-allow-application-particular-namespace.adoc
M	modules/nw-networkpolicy-allow-external-clients.adoc
M	modules/nw-networkpolicy-create-cli.adoc
M	modules/nw-networkpolicy-deny-all-allowed.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-networkpolicy-deny-all-allowed.adoc
CONFLICT (content): Merge conflict in modules/nw-networkpolicy-deny-all-allowed.adoc
Auto-merging modules/nw-networkpolicy-create-cli.adoc
Auto-merging modules/nw-networkpolicy-allow-external-clients.adoc
Auto-merging modules/nw-networkpolicy-allow-application-particular-namespace.adoc
Auto-merging modules/nw-networkpolicy-allow-application-all-namespaces.adoc
Auto-merging modules/nw-multi-network-policy-differences.adoc
CONFLICT (content): Merge conflict in modules/nw-multi-network-policy-differences.adoc
Auto-merging modules/configuration-ovnk-multi-network-policy.adoc
CONFLICT (content): Merge conflict in modules/configuration-ovnk-multi-network-policy.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 OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation

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]

@dfitzmau: #95148 failed to apply on top of branch "enterprise-4.13":

Applying: OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation
Using index info to reconstruct a base tree...
A	modules/configuration-ovnk-multi-network-policy.adoc
M	modules/nw-multi-network-policy-differences.adoc
M	modules/nw-networkpolicy-allow-application-all-namespaces.adoc
M	modules/nw-networkpolicy-allow-application-particular-namespace.adoc
M	modules/nw-networkpolicy-allow-external-clients.adoc
M	modules/nw-networkpolicy-create-cli.adoc
M	modules/nw-networkpolicy-deny-all-allowed.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-networkpolicy-deny-all-allowed.adoc
CONFLICT (content): Merge conflict in modules/nw-networkpolicy-deny-all-allowed.adoc
Auto-merging modules/nw-networkpolicy-create-cli.adoc
Auto-merging modules/nw-networkpolicy-allow-external-clients.adoc
Auto-merging modules/nw-networkpolicy-allow-application-particular-namespace.adoc
Auto-merging modules/nw-networkpolicy-allow-application-all-namespaces.adoc
Auto-merging modules/nw-multi-network-policy-differences.adoc
CONFLICT (content): Merge conflict in modules/nw-multi-network-policy-differences.adoc
CONFLICT (modify/delete): modules/configuration-ovnk-multi-network-policy.adoc deleted in HEAD and modified in OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation. Version OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation of modules/configuration-ovnk-multi-network-policy.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 OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation

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.

[openshift-cherrypick-robot]

@dfitzmau: #95148 failed to apply on top of branch "enterprise-4.12":

Applying: OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation
Using index info to reconstruct a base tree...
A	modules/configuration-ovnk-multi-network-policy.adoc
M	modules/nw-multi-network-policy-differences.adoc
M	modules/nw-networkpolicy-allow-application-all-namespaces.adoc
M	modules/nw-networkpolicy-allow-application-particular-namespace.adoc
M	modules/nw-networkpolicy-allow-external-clients.adoc
M	modules/nw-networkpolicy-create-cli.adoc
M	modules/nw-networkpolicy-deny-all-allowed.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-networkpolicy-deny-all-allowed.adoc
CONFLICT (content): Merge conflict in modules/nw-networkpolicy-deny-all-allowed.adoc
Auto-merging modules/nw-networkpolicy-create-cli.adoc
Auto-merging modules/nw-networkpolicy-allow-external-clients.adoc
Auto-merging modules/nw-networkpolicy-allow-application-particular-namespace.adoc
Auto-merging modules/nw-networkpolicy-allow-application-all-namespaces.adoc
Auto-merging modules/nw-multi-network-policy-differences.adoc
CONFLICT (content): Merge conflict in modules/nw-multi-network-policy-differences.adoc
CONFLICT (modify/delete): modules/configuration-ovnk-multi-network-policy.adoc deleted in HEAD and modified in OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation. Version OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation of modules/configuration-ovnk-multi-network-policy.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 OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation

In response to this:

/cherrypick enterprise-4.12

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.