Skip to content

OSDOCS-15649: modularizes CNI assembly MicroShift #101707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Nov 5, 2025
Merged

OSDOCS-15649: modularizes CNI assembly MicroShift #101707

merged 1 commit into from
Nov 5, 2025

Conversation

@ShaunaDiaz
Copy link
Contributor

@ShaunaDiaz ShaunaDiaz commented Nov 4, 2025 •
edited
Loading

Version(s):
4.16+

Issue:
OSDOCS-15649

Link to docs preview:
https://101707--ocpdocs-pr.netlify.app/microshift/latest/microshift_networking/microshift-cni.html
https://101707--ocpdocs-pr.netlify.app/microshift/latest/microshift_configuring/microshift-default-config-yaml.html (metadata only)

QE review:

  • N/A no technical content updated; pre-migration structure only

Additional information:
This PR updates the structure of the CNI assembly to modularize it and remove any L3s.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 4, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 4, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-15649 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-15649

Link to docs preview:

QE review:

  • N/A no technical content updated; pre-migration structure only

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 4, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 4, 2025 •
edited
Loading

🤖 Wed Nov 05 15:00:24 - Prow CI generated the docs preview:

https://101707--ocpdocs-pr.netlify.app/microshift/latest/microshift_configuring/microshift-default-config-yaml.html
https://101707--ocpdocs-pr.netlify.app/microshift/latest/microshift_networking/microshift-cni.html

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 4, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 4, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-15649 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target either version "4.21." or "openshift-4.21.", but it targets "aem-migration" instead.

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-15649

Link to docs preview:
https://101707--ocpdocs-pr.netlify.app/microshift/latest/microshift_configuring/microshift-default-config-yaml.html
https://101707--ocpdocs-pr.netlify.app/microshift/latest/microshift_networking/microshift-cni.html

QE review:

  • N/A no technical content updated; pre-migration structure only

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-robot
Copy link

openshift-ci-robot commented Nov 4, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-15649 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target either version "4.21." or "openshift-4.21.", but it targets "aem-migration" instead.

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-15649

Link to docs preview:
https://101707--ocpdocs-pr.netlify.app/microshift/latest/microshift_networking/microshift-cni.html
https://101707--ocpdocs-pr.netlify.app/microshift/latest/microshift_configuring/microshift-default-config-yaml.html (metadata only)

QE review:

  • N/A no technical content updated; pre-migration structure only

Additional information:
This PR updates the structure of the CNI assembly to modularize it and remove any L3s.

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.

@ShaunaDiaz ShaunaDiaz added the merge-review-needed Signifies that the merge review team needs to review this PR label Nov 4, 2025
@JoeAldinger JoeAldinger 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 Nov 5, 2025
@JoeAldinger JoeAldinger self-assigned this Nov 5, 2025
JoeAldinger
JoeAldinger approved these changes Nov 5, 2025
View reviewed changes
Copy link
Contributor

@JoeAldinger JoeAldinger left a comment

Choose a reason for hiding this comment

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

/lgtm one question, no deal breakers-good to merge.

modules/microshift-cni-customization-matrix.adoc
4. Setting up the firewalld service is supported by {op-system-ostree}.
5. IPv6 is supported in both single-stack and dual-stack networks with the OVN-Kubernetes network plugin. IPv6 can also be used by connecting to other networks with the {microshift-short} Multus CNI plugin.
6. Configure by using the {microshift-short} `config.yaml` file.
Additional details about networking capabilities::
Copy link
Contributor

@JoeAldinger JoeAldinger Nov 5, 2025

Choose a reason for hiding this comment

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

I like this lead in. Good option for tables.

modules/microshift-nw-topology.adoc Outdated
OVN-Kubernetes provides an overlay-based networking implementation. This overlay includes an OVS-based implementation of Service and NetworkPolicy. The overlay network uses the Geneve (Generic Network Virtualization Encapsulation) tunnel protocol. The pod maximum transmission unit (MTU) for the Geneve tunnel is set to the default route MTU if it is not configured.

[role="_abstract"]
OVN-Kubernetes provides an overlay-based networking implementation. This overlay includes an OVS-based implementation of Service and NetworkPolicy.
Copy link
Contributor

@JoeAldinger JoeAldinger Nov 5, 2025

Choose a reason for hiding this comment

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

Should this be a Service or Services and then same for NetPol?

Copy link
Contributor Author

@ShaunaDiaz ShaunaDiaz Nov 5, 2025

Choose a reason for hiding this comment

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

Yeah I saw that, too. Wasn't sure. Let me check with @ShudiLi

Copy link
Contributor Author

@ShaunaDiaz ShaunaDiaz Nov 5, 2025

Choose a reason for hiding this comment

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

OK, yeah, those are resources, I see it the K docs. TY!

@JoeAldinger JoeAldinger removed their assignment Nov 5, 2025
@JoeAldinger JoeAldinger added ok-to-merge and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR labels Nov 5, 2025
@openshift-ci
Copy link

openshift-ci bot commented Nov 5, 2025

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

@ShaunaDiaz ShaunaDiaz merged commit b778196 into openshift:main Nov 5, 2025
2 checks passed
@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 5, 2025

/cherrypick enterprise-4.21

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 5, 2025

/cherrypick enterprise-4.20

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 5, 2025

/cherrypick enterprise-4.19

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 5, 2025

/cherrypick enterprise-4.18

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 5, 2025

/cherrypick enterprise-4.17

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 5, 2025

/cherrypick enterprise-4.16

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Nov 5, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 5, 2025

@ShaunaDiaz: new pull request created: #101791

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

openshift-cherrypick-robot commented Nov 5, 2025

@ShaunaDiaz: new pull request created: #101792

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 openshift-cherrypick-robot mentioned this pull request Nov 5, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 5, 2025

@ShaunaDiaz: #101707 failed to apply on top of branch "enterprise-4.19":

Applying: OSDOCS-15649: modularizes CNI assembly MicroShift
Using index info to reconstruct a base tree...
M	microshift_networking/microshift-cni.adoc
M	modules/microshift-default-settings.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-default-settings.adoc
Auto-merging microshift_networking/microshift-cni.adoc
CONFLICT (content): Merge conflict in microshift_networking/microshift-cni.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-15649: modularizes CNI assembly MicroShift

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

openshift-cherrypick-robot commented Nov 5, 2025

@ShaunaDiaz: #101707 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-15649: modularizes CNI assembly MicroShift
Using index info to reconstruct a base tree...
M	microshift_networking/microshift-cni.adoc
M	modules/microshift-default-settings.adoc
M	modules/microshift-nw-topology.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-nw-topology.adoc
CONFLICT (content): Merge conflict in modules/microshift-nw-topology.adoc
Auto-merging modules/microshift-default-settings.adoc
Auto-merging microshift_networking/microshift-cni.adoc
CONFLICT (content): Merge conflict in microshift_networking/microshift-cni.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-15649: modularizes CNI assembly MicroShift

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

openshift-cherrypick-robot commented Nov 5, 2025

@ShaunaDiaz: #101707 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-15649: modularizes CNI assembly MicroShift
Using index info to reconstruct a base tree...
M	microshift_networking/microshift-cni.adoc
M	modules/microshift-default-settings.adoc
M	modules/microshift-nw-topology.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-nw-topology.adoc
CONFLICT (content): Merge conflict in modules/microshift-nw-topology.adoc
Auto-merging modules/microshift-default-settings.adoc
Auto-merging microshift_networking/microshift-cni.adoc
CONFLICT (content): Merge conflict in microshift_networking/microshift-cni.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-15649: modularizes CNI assembly MicroShift

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

openshift-cherrypick-robot commented Nov 5, 2025

@ShaunaDiaz: #101707 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-15649: modularizes CNI assembly MicroShift
Using index info to reconstruct a base tree...
M	microshift_networking/microshift-cni.adoc
M	modules/microshift-cni-customization-matrix.adoc
M	modules/microshift-default-settings.adoc
M	modules/microshift-nw-topology.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-nw-topology.adoc
CONFLICT (content): Merge conflict in modules/microshift-nw-topology.adoc
Auto-merging modules/microshift-default-settings.adoc
Auto-merging modules/microshift-cni-customization-matrix.adoc
CONFLICT (content): Merge conflict in modules/microshift-cni-customization-matrix.adoc
Auto-merging microshift_networking/microshift-cni.adoc
CONFLICT (content): Merge conflict in microshift_networking/microshift-cni.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-15649: modularizes CNI assembly MicroShift

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.

This was referenced Nov 5, 2025
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JoeAldinger JoeAldinger JoeAldinger approved these changes

Assignees

No one assigned

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 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. ok-to-merge size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ShaunaDiaz @openshift-ci-robot @ocpdocs-previewbot @openshift-cherrypick-robot @JoeAldinger