Skip to content

OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bri… - #119740

Merged
dfitzmau merged 1 commit into
openshift:mainfrom
dfitzmau:OCPBUGS-121938
Sep 29, 2026
Merged

dfitzmau merged 1 commit into
openshift:mainfrom
dfitzmau:OCPBUGS-121938

Conversation

@dfitzmau

@dfitzmau dfitzmau commented Sep 11, 2026 •

Copy link
Copy Markdown
Contributor

Version(s):
4.16+

Issue:
OCPBUGS-121938

Link to docs preview:

  • SME has approved this change (Pablo R.).
  • QE has approved this change (Ros B.).

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 11, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@dfitzmau: This pull request references Jira Issue OCPBUGS-121938, which is invalid:

  • expected the bug to target the "5.1.0" version, but no target version was set
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Ask B.Nemec about "It might make sense to provide instructions on how to use butane to generate the machine config from the file, as it is done in other sections of the documentation."

Version(s):
4.16+

Issue:
OCPBUGS-121938

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

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.

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 11, 2026
@dfitzmau dfitzmau 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 branch/enterprise-5.0 and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Sep 11, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 17, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@dfitzmau: This pull request references Jira Issue OCPBUGS-121938, which is invalid:

  • expected the bug to target the "5.1.0" version, but no target version was set
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Ask B.Nemec about "It might make sense to provide instructions on how to use butane to generate the machine config from the file, as it is done in other sections of the documentation."

Version(s):
4.16+

Issue:
OCPBUGS-121938

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

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.

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 17, 2026
@openshift-ci openshift-ci Bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 17, 2026
@dfitzmau
dfitzmau force-pushed the OCPBUGS-121938 branch 2 times, most recently from 4aa3e6f to b813322 Compare September 22, 2026 10:28

@palonsoro palonsoro left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Minor improvement suggestion.


====
+
The following example sets the MTU to `9000` for both the physical device and the bridge interface in the NMState configuration file. You must base64-encode the file and then embed the output in a `MachineConfig` manifest file. The `MachineConfig` manifest file writes to `/etc/nmstate/openshift/cluster.yml` or a per-node path under `/etc/nmstate/openshift/`.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Not sure if there would be a way to make it clearer is that increasing MTU to 9000 is just a single example among the many things the user could do.

For the rest, it looks good to me as of now.

@palonsoro

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci

openshift-ci Bot commented Sep 29, 2026

Copy link
Copy Markdown

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

@dfitzmau
dfitzmau merged commit 156fa87 into openshift:main Sep 29, 2026
2 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@dfitzmau: Jira Issue OCPBUGS-121938: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-121938 has been moved to the MODIFIED state.

Details

In response to this:

Version(s):
4.16+

Issue:
OCPBUGS-121938

Link to docs preview:

  • SME has approved this change (Pablo R.).
  • QE has approved this change (Ros B.).

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.

@dfitzmau

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-5.0

@dfitzmau

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.22

@dfitzmau

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.21

@dfitzmau

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.20

@dfitzmau

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.19

@dfitzmau

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.18

@dfitzmau

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.17

@dfitzmau

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

Copy link
Copy Markdown

@dfitzmau: new pull request created: #120682

Details

In response to this:

/cherrypick enterprise-5.0

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

Copy link
Copy Markdown

@dfitzmau: #119740 failed to apply on top of branch "enterprise-4.19":

Applying: OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState
Using index info to reconstruct a base tree...
M	installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc
M	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
M	installing/installing_bare_metal/upi/installing-bare-metal.adoc
M	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/migrating-br-ex-bridge-nmstate.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc
Auto-merging installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
Auto-merging installing/installing_bare_metal/upi/installing-bare-metal.adoc
Auto-merging installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
CONFLICT (modify/delete): modules/migrating-br-ex-bridge-nmstate.adoc deleted in HEAD and modified in OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState.  Version OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState of modules/migrating-br-ex-bridge-nmstate.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 OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState

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

Copy link
Copy Markdown

@dfitzmau: new pull request created: #120683

Details

In response to this:

/cherrypick enterprise-4.22

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

Copy link
Copy Markdown

@dfitzmau: #119740 failed to apply on top of branch "enterprise-4.18":

Applying: OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState
Using index info to reconstruct a base tree...
M	installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc
M	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
M	installing/installing_bare_metal/upi/installing-bare-metal.adoc
M	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/migrating-br-ex-bridge-nmstate.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc
Auto-merging installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
Auto-merging installing/installing_bare_metal/upi/installing-bare-metal.adoc
Auto-merging installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
CONFLICT (modify/delete): modules/migrating-br-ex-bridge-nmstate.adoc deleted in HEAD and modified in OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState.  Version OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState of modules/migrating-br-ex-bridge-nmstate.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 OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState

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

Copy link
Copy Markdown

@dfitzmau: new pull request created: #120684

Details

In response to this:

/cherrypick enterprise-4.21

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

Copy link
Copy Markdown

@dfitzmau: #119740 failed to apply on top of branch "enterprise-4.17":

Applying: OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState
Using index info to reconstruct a base tree...
A	installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/migrating-br-ex-bridge-nmstate.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState.  Version OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState of installing/installing_bare_metal/upi/installing-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState.  Version OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState of installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc left in tree.
Auto-merging installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc
CONFLICT (content): Merge conflict in installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc
Auto-merging installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
CONFLICT (content): Merge conflict in installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
CONFLICT (modify/delete): modules/migrating-br-ex-bridge-nmstate.adoc deleted in HEAD and modified in OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState.  Version OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState of modules/migrating-br-ex-bridge-nmstate.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 OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState

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.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@dfitzmau: new pull request created: #120685

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.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@dfitzmau: #119740 failed to apply on top of branch "enterprise-4.16":

Applying: OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState
Using index info to reconstruct a base tree...
A	installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/migrating-br-ex-bridge-nmstate.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState.  Version OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState of installing/installing_bare_metal/upi/installing-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState.  Version OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState of installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc left in tree.
Auto-merging installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc
CONFLICT (content): Merge conflict in installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc
Auto-merging installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
CONFLICT (content): Merge conflict in installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
CONFLICT (modify/delete): modules/migrating-br-ex-bridge-nmstate.adoc deleted in HEAD and modified in OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState.  Version OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState of modules/migrating-br-ex-bridge-nmstate.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 OCPBUGS-121938: Reworked the note on Migrating a configured br-ex bridge to NMState

Details

In response to this:

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

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 branch/enterprise-4.21 branch/enterprise-4.22 branch/enterprise-5.0 jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. ok-to-merge size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants