Skip to content

Conversation

@dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Jul 28, 2025

This PR removes low-level code blocks from the Multiple networks and Hardware networks docs. Tried to remove passive from some files but this might distract from the core task.

Version(s):
4.16+

Issue:
OSDOCS-15470

Link to docs preview:

  • QE has approved this change (Zhiqiang Fang SRIOV).

Epic = https://issues.redhat.com/browse/OSDOCS-15186

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 28, 2025
@dfitzmau dfitzmau force-pushed the OSDOCS-15470-multiple-networks branch from 77ca66e to 4993014 Compare July 28, 2025 15:23
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jul 28, 2025

🤖 Mon Aug 18 11:51:49 - Prow CI generated the docs preview:
https://96759--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@dfitzmau dfitzmau force-pushed the OSDOCS-15470-multiple-networks branch 3 times, most recently from 5320b89 to e1e2a82 Compare July 28, 2025 16:04
@dfitzmau dfitzmau changed the title OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for … OSDOCS-15470-multiple-hardware-networks: Removed unneccessary code blocks for … Jul 28, 2025
@weliang1
Copy link

Review multus files.
/lgtm

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 14, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2025
@dfitzmau dfitzmau force-pushed the OSDOCS-15470-multiple-networks branch from e1e2a82 to 11f1c6c Compare August 18, 2025 11:31
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2025
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 18, 2025
@openshift-ci
Copy link

openshift-ci bot commented Aug 18, 2025

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

@zhiqiangf
Copy link

Reviewed sriov files.
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 2, 2025
@dfitzmau dfitzmau added the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 3, 2025
@bscott-rh bscott-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Sep 3, 2025
Copy link
Contributor

@bscott-rh bscott-rh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge review LGTM.

@bscott-rh bscott-rh removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Sep 3, 2025
@bscott-rh bscott-rh merged commit cd11c0e into openshift:main Sep 3, 2025
2 checks passed
@bscott-rh
Copy link
Contributor

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

@openshift-cherrypick-robot

@bscott-rh: #96759 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs
Using index info to reconstruct a base tree...
M	modules/cnf-assigning-a-secondary-network-to-a-vrf.adoc
M	modules/nw-multus-create-master-interface-bridge-cni.adoc
M	modules/nw-multus-create-network.adoc
M	modules/nw-multus-creating-whereabouts-reconciler-daemon-set.adoc
A	modules/nw-multus-whereabouts-fast-ipam.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-delete-cli.adoc
M	modules/nw-networkpolicy-deny-all-allowed.adoc
M	modules/nw-sriov-hwol-configuring-machine-config-pool.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-hwol-configuring-machine-config-pool.adoc
CONFLICT (content): Merge conflict in modules/nw-sriov-hwol-configuring-machine-config-pool.adoc
Auto-merging modules/nw-networkpolicy-deny-all-allowed.adoc
Auto-merging modules/nw-networkpolicy-delete-cli.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
CONFLICT (modify/delete): modules/nw-multus-whereabouts-fast-ipam.adoc deleted in HEAD and modified in OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs. Version OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs of modules/nw-multus-whereabouts-fast-ipam.adoc left in tree.
Auto-merging modules/nw-multus-creating-whereabouts-reconciler-daemon-set.adoc
Auto-merging modules/nw-multus-create-network.adoc
CONFLICT (content): Merge conflict in modules/nw-multus-create-network.adoc
Auto-merging modules/nw-multus-create-master-interface-bridge-cni.adoc
Auto-merging modules/cnf-assigning-a-secondary-network-to-a-vrf.adoc
CONFLICT (content): Merge conflict in modules/cnf-assigning-a-secondary-network-to-a-vrf.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 OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs

In response to this:

/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/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.

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.20

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.19

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.18

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@bscott-rh: new pull request created: #98439

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

@bscott-rh: new pull request created: #98440

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

@bscott-rh: #96759 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs
Using index info to reconstruct a base tree...
A	modules/nw-multus-whereabouts-fast-ipam.adoc
M	modules/nw-sriov-hwol-configuring-machine-config-pool.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-hwol-configuring-machine-config-pool.adoc
CONFLICT (content): Merge conflict in modules/nw-sriov-hwol-configuring-machine-config-pool.adoc
CONFLICT (modify/delete): modules/nw-multus-whereabouts-fast-ipam.adoc deleted in HEAD and modified in OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs. Version OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs of modules/nw-multus-whereabouts-fast-ipam.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 OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs

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

@bscott-rh: #96759 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs
Using index info to reconstruct a base tree...
A	modules/nw-multus-whereabouts-fast-ipam.adoc
M	modules/nw-sriov-hwol-configuring-machine-config-pool.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-hwol-configuring-machine-config-pool.adoc
CONFLICT (content): Merge conflict in modules/nw-sriov-hwol-configuring-machine-config-pool.adoc
CONFLICT (modify/delete): modules/nw-multus-whereabouts-fast-ipam.adoc deleted in HEAD and modified in OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs. Version OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs of modules/nw-multus-whereabouts-fast-ipam.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 OSDOCS-15470-multiple-networks: Removed unneccessary code blocks for multi networks docs

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants