Skip to content
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.

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

USHIFT-2225: Create CRI-O cfg to use Multus over ovn-k #3064

Merged
merged 1 commit into from
Feb 26, 2024

Conversation

pmtk
Copy link
Member

@pmtk pmtk commented Feb 26, 2024

No description provided.

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

openshift-ci-robot commented Feb 26, 2024

@pmtk: This pull request references USHIFT-2225 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 task to target the "4.16.0" version, but no target version was set.

In response to this:

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 26, 2024
plugin_dirs = [
"/opt/cni/bin",
"/usr/libexec/cni"
]
Copy link
Contributor

Choose a reason for hiding this comment

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

Looking at the ovn config file, we also have crio.runtime.workloads.management to pin the CPU 0.
Should we duplicate it here as well so that the config is self-contained?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's not needed, These are overrides over what's present in the other file - we'll install both files. The lines you commented are in different order.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, it's not needed now, but if we're talking about potential separation of network drivers, shouldn't we keep each file self-contained?
At least, can we add a comment that we expect the network driver to be restricted to CPU 0 and the configuration is elsewhere?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think this works like that - it seems to be using annotations to target specific Pods, target.workload.openshift.io/management in this case and that annotation is also present in manifests of csi-snapshotter, dns, node-resolver, router, service-ca, and OLM. If anything, that configuration should be in 10-microshift.conf and if other CNIs should make use of it, they should include that annotation in the manifests.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see. Thank you for explaining.
We should better refactor it in a different PR then.

@pmtk
Copy link
Member Author

pmtk commented Feb 26, 2024

/retest

@ggiguash
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2024
Copy link
Contributor

openshift-ci bot commented Feb 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pmtk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

openshift-ci bot commented Feb 26, 2024

@pmtk: 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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 6639451 into openshift:main Feb 26, 2024
9 checks passed
@pmtk pmtk deleted the multus/crio-conf branch February 27, 2024 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants