[enterprise-4.18]: OSDOCS-16833

[JoeAldinger]

Version(s):

Issue:

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

[ocpdocs-previewbot]

🤖 Tue Jan 13 15:52:29 - Prow CI generated the docs preview:

https://104718--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/multiple_networks/primary_networks/about-primary-nwt-nad.html
https://104718--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/multiple_networks/primary_networks/about-user-defined-networks.html

[openshift-ci]

@JoeAldinger: all tests passed!

Full PR test history. Your PR dashboard.

Details

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]

/cherrypick enterprise-4.17

[openshift-cherrypick-robot]

@JoeAldinger: #104718 failed to apply on top of branch "enterprise-4.17":

Applying: MNW-2: CQA 2.0
Using index info to reconstruct a base tree...
A	modules/cudn-status-conditions.adoc
A	modules/nw-cudn-about.adoc
A	modules/nw-cudn-best-practices.adoc
A	modules/nw-cudn-cr-ui.adoc
A	modules/nw-cudn-cr.adoc
A	modules/nw-udn-about.adoc
M	modules/nw-udn-additional-config-details.adoc
M	modules/nw-udn-benefits.adoc
M	modules/nw-udn-best-practices.adoc
A	modules/nw-udn-cr-ui.adoc
M	modules/nw-udn-cr.adoc
M	modules/nw-udn-limitations.adoc
A	modules/opening-default-network-ports-udn.adoc
M	networking/multiple_networks/primary_networks/about-user-defined-networks.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/multiple_networks/primary_networks/about-user-defined-networks.adoc
CONFLICT (content): Merge conflict in networking/multiple_networks/primary_networks/about-user-defined-networks.adoc
CONFLICT (modify/delete): modules/opening-default-network-ports-udn.adoc deleted in HEAD and modified in MNW-2: CQA 2.0. Version MNW-2: CQA 2.0 of modules/opening-default-network-ports-udn.adoc left in tree.
Auto-merging modules/nw-udn-limitations.adoc
CONFLICT (content): Merge conflict in modules/nw-udn-limitations.adoc
Auto-merging modules/nw-udn-cr.adoc
CONFLICT (content): Merge conflict in modules/nw-udn-cr.adoc
CONFLICT (modify/delete): modules/nw-udn-cr-ui.adoc deleted in HEAD and modified in MNW-2: CQA 2.0. Version MNW-2: CQA 2.0 of modules/nw-udn-cr-ui.adoc left in tree.
Auto-merging modules/nw-udn-best-practices.adoc
CONFLICT (content): Merge conflict in modules/nw-udn-best-practices.adoc
Auto-merging modules/nw-udn-benefits.adoc
Auto-merging modules/nw-udn-additional-config-details.adoc
CONFLICT (content): Merge conflict in modules/nw-udn-additional-config-details.adoc
CONFLICT (modify/delete): modules/nw-udn-about.adoc deleted in HEAD and modified in MNW-2: CQA 2.0. Version MNW-2: CQA 2.0 of modules/nw-udn-about.adoc left in tree.
CONFLICT (modify/delete): modules/nw-cudn-cr.adoc deleted in HEAD and modified in MNW-2: CQA 2.0. Version MNW-2: CQA 2.0 of modules/nw-cudn-cr.adoc left in tree.
CONFLICT (modify/delete): modules/nw-cudn-cr-ui.adoc deleted in HEAD and modified in MNW-2: CQA 2.0. Version MNW-2: CQA 2.0 of modules/nw-cudn-cr-ui.adoc left in tree.
CONFLICT (modify/delete): modules/nw-cudn-best-practices.adoc deleted in HEAD and modified in MNW-2: CQA 2.0. Version MNW-2: CQA 2.0 of modules/nw-cudn-best-practices.adoc left in tree.
CONFLICT (modify/delete): modules/nw-cudn-about.adoc deleted in HEAD and modified in MNW-2: CQA 2.0. Version MNW-2: CQA 2.0 of modules/nw-cudn-about.adoc left in tree.
CONFLICT (modify/delete): modules/cudn-status-conditions.adoc deleted in HEAD and modified in MNW-2: CQA 2.0. Version MNW-2: CQA 2.0 of modules/cudn-status-conditions.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 set advice.mergeConflict false"
Patch failed at 0001 MNW-2: CQA 2.0

Details

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.

[JoeAldinger]

xref: #103943
commit: e93defb