[enterprise-4.19] OSDOCS-16848

[openshift-cherrypick-robot]

This is an automated cherry-pick of #106783

/assign JoeAldinger

[openshift-ci]

@openshift-cherrypick-robot: 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]

git commit: 4a21e0f
xref: #106087

[JoeAldinger]

/cherrypick enterprise-4.18

[openshift-cherrypick-robot]

@JoeAldinger: #106795 failed to apply on top of branch "enterprise-4.18":

Applying: NOP-7
Using index info to reconstruct a base tree...
M	modules/k8s-nmstate-deploying-nmstate-CLI.adoc
M	modules/k8s-nmstate-uninstall-operator.adoc
M	modules/nw-dns-forward.adoc
M	modules/nw-dns-view.adoc
M	modules/nw-infw-operator-config-object.adoc
M	modules/nw-infw-operator-cr.adoc
M	modules/nw-infw-operator-installing-cli.adoc
M	modules/viewing-stats-collected-kubernetes-nmtate-op.adoc
M	networking/networking_operators/dns-operator.adoc
M	networking/networking_operators/ingress-node-firewall-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/networking_operators/ingress-node-firewall-operator.adoc
Auto-merging networking/networking_operators/dns-operator.adoc
Auto-merging modules/viewing-stats-collected-kubernetes-nmtate-op.adoc
Auto-merging modules/nw-infw-operator-installing-cli.adoc
Auto-merging modules/nw-infw-operator-cr.adoc
Auto-merging modules/nw-infw-operator-config-object.adoc
CONFLICT (content): Merge conflict in modules/nw-infw-operator-config-object.adoc
Auto-merging modules/nw-dns-view.adoc
Auto-merging modules/nw-dns-forward.adoc
CONFLICT (content): Merge conflict in modules/nw-dns-forward.adoc
Auto-merging modules/k8s-nmstate-uninstall-operator.adoc
CONFLICT (content): Merge conflict in modules/k8s-nmstate-uninstall-operator.adoc
Auto-merging modules/k8s-nmstate-deploying-nmstate-CLI.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 set advice.mergeConflict false"
Patch failed at 0001 NOP-7

Details

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.