-
Notifications
You must be signed in to change notification settings - Fork 190
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
Conversation
@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. |
b168e19
to
fc72ef2
Compare
- name: cnibin | ||
mountPath: /host/opt/cni/bin | ||
env: | ||
- name: RHEL8_SOURCE_DIRECTORY |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 env
s and the ConfigMap that copies binaries later.
Or maybe I'll change it right away
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed, thx
0afcf92
to
be00646
Compare
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
be00646
to
1c83841
Compare
/lgtm |
[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 |
@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. |
# 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}" |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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)
No description provided.