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.
* Added a test for GetLoggingLevel
* Added up to 96% coverage for checkpoint.go
* Improved coverage of checkpoint.go to 96.4%
* Improved coverage of checkpoint.go to 96.4%
* Adding changes so i will have them saved for my remote fork thingy
* Fixed unit tests in checkpoint_test.go and conf_test.go
* Removed unnecessary comments
* improved conf code coverage by an amount that is greater than 0!
* improved coverage, but line 144 of conf.go needs a look
* Added unit tests to multus and types, also fixed a bug in conf.go
* added label to import types/020 in types.go
* hopefully resolved merge conflicts
* increased code coverage in multus.go and conf.go, also added bug fixes and formatting
* addressed all comments in review
* Updated testing.go with better comments
* changed 'thejohn' to '_not_type' for readability
* added additional unit tests
* added tests to kubeletclient.go
* added more unit tests to k8sclient.go and kubeletclient.go
* Added network status annotations section to quickstart and added more unit tests
* made changes to tests based on code review
This change introduces two fix about CNIVersion. One is to add CNIVersion into
delegated CNI conflist in case of DEL if CNIVersion is missing. ParseVersion() in libcni
checks cniVersion as mandatory field and sometimes user/daemonset miss it.
The latest flannel daemonset yaml (of flannel github) does not have CNIVersion, for example.
This change adds CNIVersion from multus config if cniVersion is missing (empty) in delegated
CNI config.
In addition, this fix also adds '--cni-version' in entrypoint.sh to add cniVersion in multus
config in case of '--multus-conf-file=auto'.
This change introduces two fix about CNIVersion. One is to add CNIVersion into
delegated CNI conflist in case of DEL if CNIVersion is missing. ParseVersion() in libcni
checks cniVersion as mandatory field and sometimes user/daemonset miss it.
The latest flannel daemonset yaml (of flannel github) does not have CNIVersion, for example.
This change adds CNIVersion from multus config if cniVersion is missing (empty) in delegated
CNI config.
In addition, this fix also adds '--cni-version' in entrypoint.sh to add cniVersion in multus
config in case of '--multus-conf-file=auto'.
The flannel yaml in the example is using 10.244.0.0/16. If user bootstraps
a k8s cluster with different pod cidr, pod traffic will not go thru the flannel
vxlan tunnel.
This change provides new configuration parameters, multusNamespace
and systemNamespaces for flexible namespace management.
The change addresses issue #252 and issue #253.
This change provides new configuration parameters, multusNamespace
and systemNamespaces for flexible namespace management.
The change addresses issue #252 and issue #253.
This fix is to add declaration about clusterNetwork/defaultNetwork
net-attach-def is in 'default' namesspace. In addition, this code
changes to skip defaultNetwork in case of 'kube-system' namespace
as well (#202).
