[enterprise-4.21] OSDOCS-16848

[JoeAldinger]

Version(s):

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

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

[openshift-ci-robot]

@JoeAldinger: This pull request references OSDOCS-10818 which is a valid jira issue.

Details

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

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.

[JoeAldinger]

#106087
commit Id: 4a21e0f

[openshift-ci-robot]

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

Details

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

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 Feb 17 18:41:21 - Prow CI generated the docs preview:

https://106783--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/networking_operators/dns-operator.html
https://106783--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/networking_operators/ingress-node-firewall-operator.html
https://106783--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/networking_operators/k8s-nmstate-about-the-k8s-nmstate-operator.html

[ocpdocs-vale-bot]

🤖 [error] Vale.Terms: Use 'Operators?' instead of 'operator'.

[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.20

[openshift-cherrypick-robot]

@JoeAldinger: new pull request created: #106791

Details

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.

[JoeAldinger]

/cherrypick enterprise-4.19

[JoeAldinger]

/cherrypick enterprise-4.18

[JoeAldinger]

/cherrypick enterprise-4.17

[openshift-cherrypick-robot]

@JoeAldinger: new pull request created: #106795

Details

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]

@JoeAldinger: #106783 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-installing-the-kubernetes-nmstate-operator.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/nw-infw-operator-installing-console.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-console.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-installing-the-kubernetes-nmstate-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.

[openshift-cherrypick-robot]

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

Applying: NOP-7
Using index info to reconstruct a base tree...
M	modules/k8s-nmstate-deploying-nmstate-CLI.adoc
M	modules/k8s-nmstate-installing-the-kubernetes-nmstate-operator.adoc
M	modules/k8s-nmstate-uninstall-operator.adoc
M	modules/nw-controlling-dns-pod-placement.adoc
M	modules/nw-dns-forward.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/nw-infw-operator-installing-console.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-console.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-forward.adoc
CONFLICT (content): Merge conflict in modules/nw-dns-forward.adoc
Auto-merging modules/nw-controlling-dns-pod-placement.adoc
CONFLICT (content): Merge conflict in modules/nw-controlling-dns-pod-placement.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-installing-the-kubernetes-nmstate-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.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.