NOP-7 by JoeAldinger · Pull Request #106087 · openshift/openshift-docs

JoeAldinger · 2026-02-05T21:48:44Z

Version(s):
4.16+

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

Link to docs preview:

QE review:

QE has approved this change.

Additional information:

ocpdocs-previewbot · 2026-02-05T21:58:44Z

🤖 Tue Feb 17 15:02:41 - Prow CI generated the docs preview:

modules/nw-dns-operatorloglevel.adoc

modules/k8s-nmstate-deploying-nmstate-CLI.adoc

modules/nw-controlling-dns-pod-placement.adoc

stevsmit · 2026-02-11T18:27:02Z

modules/nw-controlling-dns-pod-placement.adoc

-<2> The `tolerationSeconds` field is optional.
+
+
+* If the `key` field is set to `dns-only`, it can be tolerated indefinitely.


Can you check the numbering here? https://106087--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/networking_operators/dns-operator.html#nw-controlling-dns-pod-placement_dns-operator using (**) might resolve any potential issues?

stevsmit

Big takeaways: Generally we want to try to use "Specifies. . ." in call outs, though we can't always force it. In the case where we can't force it, we want to strive for parallelism. That comes from Andrea/Ingrid.

modules/nw-controlling-dns-pod-placement.adoc

modules/nw-dns-operator-managementState.adoc

modules/nw-dns-viewlog.adoc

modules/nw-dns-forward.adoc

modules/nw-dns-operatorloglevel.adoc

modules/nw-infw-operator-cr.adoc

modules/nw-infw-operator-deploying.adoc

modules/viewing-stats-collected-kubernetes-nmtate-op.adoc

networking/networking_operators/dns-operator.adoc

networking/networking_operators/ingress-node-firewall-operator.adoc

openshift-ci · 2026-02-12T16:40:24Z

New changes are detected. LGTM label has been removed.

openshift-ci · 2026-02-17T15:40:14Z

@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 · 2026-02-17T16:02:58Z

/cherrypick enterprise-4.22
/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16

openshift-cherrypick-robot · 2026-02-17T16:03:50Z

@JoeAldinger: #106087 failed to apply on top of branch "enterprise-4.16":

Applying: NOP-7
Using index info to reconstruct a base tree...
M	modules/k8s-nmstate-installing-the-kubernetes-nmstate-operator.adoc
M	modules/k8s-nmstate-uninstall-operator.adoc
A	modules/nw-bpfman-infw-about.adoc
A	modules/nw-bpfman-infw-configure.adoc
M	modules/nw-controlling-dns-pod-placement.adoc
M	modules/nw-dns-cache-tuning.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
A	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
CONFLICT (modify/delete): modules/viewing-stats-collected-kubernetes-nmtate-op.adoc deleted in HEAD and modified in NOP-7. Version NOP-7 of modules/viewing-stats-collected-kubernetes-nmtate-op.adoc left in tree.
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/nw-dns-cache-tuning.adoc
CONFLICT (content): Merge conflict in modules/nw-dns-cache-tuning.adoc
Auto-merging modules/nw-controlling-dns-pod-placement.adoc
CONFLICT (content): Merge conflict in modules/nw-controlling-dns-pod-placement.adoc
CONFLICT (modify/delete): modules/nw-bpfman-infw-configure.adoc deleted in HEAD and modified in NOP-7. Version NOP-7 of modules/nw-bpfman-infw-configure.adoc left in tree.
CONFLICT (modify/delete): modules/nw-bpfman-infw-about.adoc deleted in HEAD and modified in NOP-7. Version NOP-7 of modules/nw-bpfman-infw-about.adoc left in tree.
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
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.22
/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/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 · 2026-02-17T16:04:40Z

@JoeAldinger: #106087 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-cache-tuning.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/nw-dns-cache-tuning.adoc
CONFLICT (content): Merge conflict in modules/nw-dns-cache-tuning.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.22
/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/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 · 2026-02-17T16:05:30Z

@JoeAldinger: #106087 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-cache-tuning.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-dns-cache-tuning.adoc
CONFLICT (content): Merge conflict in modules/nw-dns-cache-tuning.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.22
/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/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 · 2026-02-17T16:06:15Z

@JoeAldinger: #106087 failed to apply on top of branch "enterprise-4.19":

Applying: NOP-7
Using index info to reconstruct a base tree...
M	modules/k8s-nmstate-installing-the-kubernetes-nmstate-operator.adoc
M	modules/k8s-nmstate-uninstall-operator.adoc
M	modules/nw-dns-cache-tuning.adoc
M	modules/nw-dns-forward.adoc
M	modules/nw-dns-view.adoc
M	modules/nw-infw-operator-installing-console.adoc
M	modules/viewing-stats-collected-kubernetes-nmtate-op.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/viewing-stats-collected-kubernetes-nmtate-op.adoc
Auto-merging modules/nw-infw-operator-installing-console.adoc
Auto-merging modules/nw-dns-view.adoc
Auto-merging modules/nw-dns-forward.adoc
Auto-merging modules/nw-dns-cache-tuning.adoc
CONFLICT (content): Merge conflict in modules/nw-dns-cache-tuning.adoc
Auto-merging modules/k8s-nmstate-uninstall-operator.adoc
Auto-merging modules/k8s-nmstate-installing-the-kubernetes-nmstate-operator.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.22
/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/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 · 2026-02-17T16:07:01Z

@JoeAldinger: #106087 failed to apply on top of branch "enterprise-4.20":

Applying: NOP-7
Using index info to reconstruct a base tree...
M	modules/k8s-nmstate-uninstall-operator.adoc
M	modules/nw-dns-cache-tuning.adoc
M	modules/nw-dns-forward.adoc
M	modules/nw-dns-view.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-dns-view.adoc
Auto-merging modules/nw-dns-forward.adoc
Auto-merging modules/nw-dns-cache-tuning.adoc
CONFLICT (content): Merge conflict in modules/nw-dns-cache-tuning.adoc
Auto-merging modules/k8s-nmstate-uninstall-operator.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.22
/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/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 · 2026-02-17T16:07:45Z

@JoeAldinger: #106087 failed to apply on top of branch "enterprise-4.21":

Applying: NOP-7
Using index info to reconstruct a base tree...
M	modules/nw-dns-cache-tuning.adoc
M	modules/nw-dns-view.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-dns-view.adoc
Auto-merging modules/nw-dns-cache-tuning.adoc
CONFLICT (content): Merge conflict in modules/nw-dns-cache-tuning.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.22
/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/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 · 2026-02-17T16:08:37Z

@JoeAldinger: new pull request created: #106763

Details

In response to this:

/cherrypick enterprise-4.22
/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/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-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 5, 2026

JoeAldinger added branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 branch/enterprise-4.22 labels Feb 5, 2026

JoeAldinger added this to the Continuous Release milestone Feb 5, 2026

ocpdocs-vale-bot reviewed Feb 5, 2026

View reviewed changes

modules/nw-dns-operatorloglevel.adoc Outdated Show resolved Hide resolved

JoeAldinger force-pushed the OSDOCS-16848-patch branch from 6893c87 to 2ed7708 Compare February 11, 2026 17:19

stevsmit added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Feb 11, 2026

stevsmit reviewed Feb 11, 2026

View reviewed changes

modules/k8s-nmstate-deploying-nmstate-CLI.adoc Outdated Show resolved Hide resolved

stevsmit reviewed Feb 11, 2026

View reviewed changes

modules/nw-controlling-dns-pod-placement.adoc Outdated Show resolved Hide resolved

stevsmit reviewed Feb 11, 2026

View reviewed changes

JoeAldinger force-pushed the OSDOCS-16848-patch branch 6 times, most recently from 2d69776 to d20f311 Compare February 12, 2026 13:59

stevsmit added the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2026

JoeAldinger force-pushed the OSDOCS-16848-patch branch from d20f311 to e05d649 Compare February 12, 2026 16:40

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2026

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 13, 2026

NOP-7

4a21e0f

JoeAldinger force-pushed the OSDOCS-16848-patch branch from e05d649 to 4a21e0f Compare February 17, 2026 14:54

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 17, 2026

JoeAldinger merged commit 6c48aa7 into openshift:main Feb 17, 2026
2 checks passed

openshift-cherrypick-robot mentioned this pull request Feb 17, 2026

[enterprise-4.22] NOP-7 #106763

Merged

This was referenced Feb 17, 2026

[enterprise-4.21] OSDOCS-16848 #106783

Merged

[enterprise-4.18]OSDOCS-16848 #106801

Merged

[enterprise-4.19] OSDOCS-16848 #106795

Merged

[enterprise-4.17]OSDOCS-16848 #107103

Open

[enterprise-4.16]OSDOCS-16848 #107104

Open

Comments

Conversation

JoeAldinger commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ocpdocs-previewbot commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stevsmit Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

stevsmit left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

openshift-ci bot commented Feb 12, 2026

Uh oh!

openshift-ci bot commented Feb 17, 2026

Uh oh!

Uh oh!

JoeAldinger commented Feb 17, 2026

Uh oh!

openshift-cherrypick-robot commented Feb 17, 2026

Uh oh!

openshift-cherrypick-robot commented Feb 17, 2026

Uh oh!

openshift-cherrypick-robot commented Feb 17, 2026

Uh oh!

openshift-cherrypick-robot commented Feb 17, 2026

Uh oh!

openshift-cherrypick-robot commented Feb 17, 2026

Uh oh!

openshift-cherrypick-robot commented Feb 17, 2026

Uh oh!

openshift-cherrypick-robot commented Feb 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

JoeAldinger commented Feb 5, 2026 •

edited

Loading

ocpdocs-previewbot commented Feb 5, 2026 •

edited

Loading