Support GUID CNI runtime config #70
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pull Request Test Coverage Report for Build 241
💛 - Coveralls |
Add `DAEMON_SM_PLUGIN_PATH` environment variable to allow loading plugins from a custom directory. Default value is set to the original path (root dir) This eases Development by allowing to specify the plugins dir in a custom location.
- Retrieve guid value by runtime config or cni-args - Set GUID in pod annotation in either runtime config or cni-args according to provided parameters - Determine wether or on a POD has guid request according to either the existance of infinibandGUID runtime config or guid attribute in cni args
|
All Prereq have been met. This PR should ideally be split into 2:
|
Update the package to a newer version that contains infiniband-guid runtime config This required to bump up k8s related dependent packages from verison 1.17 to version that support k8s 1.18.3 as its required by the newer network-attach-def-client package
adrianchiris
force-pushed
the
guid-runtime-config
branch
from
6fe3f75
to
eb7cb0e
Compare
adrianchiris
changed the title
|
The change was validated and confirmed to be working. |
moshe010
requested changes
Jul 28, 2020
pkg/daemon/daemon.go
Outdated
| @@ -246,7 +248,9 @@ func (d *daemon) AddPeriodicUpdate() { | |||
| d.guidPodNetworkMap[allocatedGUID] = podNetworkID | |||
| } | |||
|
|
|||
| if err = utils.SetPodNetworkGUID(network, allocatedGUID); err != nil { | |||
| // TODO(adrianc): should we just set GUID both in CNI ARGS and runtime config ? | |||
There was a problem hiding this comment.
i was thinking at the time of a cluster with different versions of ib-sriov cni where some might support infinibandGUID runtime config and some might not, however we should not hide configuration issues here so ill remove this TODO.
pkg/daemon/daemon.go
Outdated
| @@ -263,11 +267,12 @@ func (d *daemon) AddPeriodicUpdate() { | |||
| pod.Annotations[v1.NetworkAttachmentAnnot] = string(netAnnotations) | |||
| } | |||
|
|
|||
| // used GUID as net.HardwareAddress to use it in sm plugin which receive n[]et.HardwareAddress as parameter | |||
| // Create a GUID list as net.HardwareAddress to be used it in sm plugin | |||
There was a problem hiding this comment.
I think you can remove the "it"
There was a problem hiding this comment.
will remove sure
pkg/daemon/daemon.go
Outdated
| guidList = append(guidList, guidAddr.HardWareAddress()) | ||
| passedPods = append(passedPods, pod) | ||
| } | ||
|
|
||
| // Get configured PKEY for network and Add the relevand POD GUIDs as members of the PKey via Subnet Manager |
There was a problem hiding this comment.
s/Add/add
s/relevand/relevant
|
I will also open an issue to deprecate the GUID attribute in ib-sriov-cni so we use only one form |
- Typos and comment changes
moshe010
approved these changes
Jul 29, 2020
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
we should first:
k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1/types.gowith the new infiniband-guid runtime config. PR 25