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-2220: Initial Multus manifests #2956

Merged
merged 2 commits into from
Feb 5, 2024

Conversation

pmtk
Copy link
Member

@pmtk pmtk commented Jan 31, 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 Jan 31, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 31, 2024

@pmtk: This pull request references USHIFT-2220 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 Jan 31, 2024
@pmtk
Copy link
Member Author

pmtk commented Jan 31, 2024

/cc @zshi-redhat @s1061123 @dhellmann

- name: cnibin
mountPath: /host/opt/cni/bin
env:
- name: RHEL8_SOURCE_DIRECTORY
Copy link
Contributor

Choose a reason for hiding this comment

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

do we support microshift on rhel8?

Copy link
Member Author

@pmtk pmtk Feb 1, 2024

Choose a reason for hiding this comment

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

No, but we don't have the microshift specific Multus image yet and I plan to change these envs and the ConfigMap that copies binaries later.

Or maybe I'll change it right away

Copy link
Member Author

Choose a reason for hiding this comment

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

Changed, thx

@pmtk pmtk force-pushed the multus/manifests branch 3 times, most recently from 0afcf92 to be00646 Compare February 5, 2024 10:20
Based on OpenShift's manifests. Key differences are:
- dhcp daemon is not deployed
- sysctls are not configured in /etc/cni/tunning
- cnibincopy.sh is stripped off rhel8 parts and receives additional env
  arg to specify binaries to copy
- multus uses thin plugin instead of thick
- whereabouts-reconciler DaemonSet is not deployed
- installation of extra CNIs is initContainer in Multus DaemonSet
  instead of separate DS
@ggiguash
Copy link
Contributor

ggiguash commented Feb 5, 2024

/lgtm

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

openshift-ci bot commented Feb 5, 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

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 096d0be and 2 for PR HEAD 1c83841 in total

Copy link
Contributor

openshift-ci bot commented Feb 5, 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 d122b0d into openshift:main Feb 5, 2024
9 checks passed
# TODO: Change when microshift-specific multus image is ready
value: "/usr/src/plugins/rhel9/bin/"
- name: BINARIES_TO_COPY
value: "{bridge,ipvlan,macvlan,static,dhcp,host-local}"
Copy link

Choose a reason for hiding this comment

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

Q: dhcp will be supported in MicroShift (if so, you need to create DHCP plugin server pod as https://github.com/openshift/cluster-network-operator/blob/master/bindata/network/multus/003-dhcp-daemon.yaml)

exec /usr/src/multus-cni/bin/thin_entrypoint
--multus-conf-file=auto
--multus-autoconfig-dir=/host/etc/cni/net.d
--readiness-indicator-file=/etc/cni/net.d/10-ovn-kubernetes.conf
Copy link

Choose a reason for hiding this comment

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

--readiness-indicator-file=/etc/cni/net.d/10-ovn-kubernetes.conf expects that ovn-k config will be created under '/etc/cni/net.d' of multus pod. Is that actually created by ovn-k?

Copy link
Member Author

Choose a reason for hiding this comment

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

Is it multus pod or multus cni (/opt/cni/bin/multus)? But yeah, we have that file on the host (ref)

@pmtk pmtk deleted the multus/manifests branch May 17, 2024 05:22
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

5 participants