Update to Multus v3.3 - #33
Merged
openshift-merge-robot merged 199 commits intoOct 29, 2019
Merged
Conversation
Signed-off-by: Mathieu Rohon <mathieu.rohon@orange.com>
When `--multus-conf-file=auto` is used, 00-multus.conf will be automatically generated from the CNI configuration file of the master plugin (the first file in lexicographical order in cni-conf-dir).
…neration Add the option to auto generate 00-multus.conf
Enabling kubelete checkpoint file parsing to get Pod device info so that these device information can be passed into CNI plugins that need specific device information to work on. Change-Id: I6630f56adc0a8307f575fc09ce9090c1ffca0337
Change-Id: I650fec86659b3690e1dc4b15bf84b6574cb0baba
making resourceMap a singleton object and only initialize it once if one or more CRDs have a resourceName annotation in them. Added copyright header for checkpoint/checkpoint.go. Replaced fmt.Errorf with logging. Change-Id: I54628d69324833e70a75dcf6533e6642dedde9b5
this changes will allow mocking checkpoint instance for unit tests Change-Id: I72fb25d15d5c9f28577a0fcbfcd385df523a5e57
Change-Id: I53551660ffd017fe170de58abdf7a96e29178000
Change-Id: Ieb650479b6b0fef1a4ecaeb2c3c1a7c15fff43d5
…earch-for-conffiles Improve grep in entrypoint.sh to only find .conf and .conflist files
This change fixes openshift#143, to make some specific TravisCI args parameter.
Signed-off-by: Shahar Klein <shaharklein@gmail.com>
Update flannel daemonset
The Logging Options section of README describes how to specify a file to log to. There is a typo, LogFile should be logFile to match the json. Fixes openshift#177 Signed-off-by: Michael Cambria <mcambria@redhat.com>
conflistAdd() finds binaries differently than conflistDel(). Make the two call find binaries the same way. Fixes openshift#179 Signed-off-by: Michael Cambria <mcambria@redhat.com>
To support CRD/file/directory, add clusterNetwork/defaultNetwork in multus.conf file.
To support CRD/file/directory, add clusterNetwork/defaultNetwork in multus.conf file.
To support CRD/file/directory, add clusterNetwork/defaultNetwork in multus.conf file.
…nfig file to .old
…gin-release:golang-1.10
…I plugins in alternate paths
…te binDir configuration option
This diff changes error message with fixed format for easy-to-read for users.
This changes introduce CNI RuntimeConfig for portmap, bandwidth, ip and mac for latest specification. IP and Mac is previously applied through CNI_ARGS, but it is changed to RuntimeConfig for now.
The CRD is now defined in the NetworkPlumbingWG org, along with generated libs for client, listers, informers, and deep copy functions. Therefore remove the duplicate definition here, and use the standard definition. Signed-off-by: Tim Rozet <trozet@redhat.com>
Migrates package to use capitalized name, also cleans up dependencies. Signed-off-by: Tim Rozet <trozet@redhat.com>
Previously the build script required git to be used and installed which did not allow to build Multus from a tarball which doesn't contain .git directory. That made packaging of Multus hard. Example usage after the change if you do not want to use git: ``` $ VERSION=v3.3 COMMIT=ba33df ./build ``` Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
Changes config JSON from gateway to default-route, adds Readme, fixes lint Co-authored-by: dougbtv <dosmith@redhat.com>
…etwork status results.
Resolves conflicts for a large number of files (particularly vendored) as this is an overdue update to Multus v3.3 Primarily this resolution takes --theirs, but build in particular was manually massaged.
openshift-ci-robot
added
size/XXL
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dougbtv, s1061123 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Updates to include all features within Multus v3.3
Included a large number of merge conflicts, these were primarily resolved using
--theirsto match upstream. One notable exception to that is thebuildscript which differed.