github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-06-28 08:36:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix go fmt issue.

Browse Source
This commit is contained in:
Tomofumi Hayashi 2018-12-06 13:42:17 +09:00
parent a9b40c7841
commit dd9355c3aa
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
k8sclient/k8sclient.go
View File

@ -38,7 +38,7 @@ import (
const ( const (
resourceNameAnnot = "k8s.v1.cni.cncf.io/resourceName" resourceNameAnnot = "k8s.v1.cni.cncf.io/resourceName"
defaultNetAnnot = "v1.multus-cni.io/default-network" defaultNetAnnot = "v1.multus-cni.io/default-network"
) )
// NoK8sNetworkError indicates error, no network in kubernetes // NoK8sNetworkError indicates error, no network in kubernetes
@ -432,7 +432,7 @@ func TryLoadPodDelegates(k8sArgs *types.K8sArgs, conf *types.NetConf, kubeClient
if err != nil { if err != nil {
return 0, nil, logging.Errorf("tryLoadK8sDelegates: Err in loading K8s cluster default network from pod annotation: %v", err) return 0, nil, logging.Errorf("tryLoadK8sDelegates: Err in loading K8s cluster default network from pod annotation: %v", err)
} }
if delegate != nil{ if delegate != nil {
logging.Debugf("tryLoadK8sDelegates: Overwrite the cluster default network with %v from pod annotations", delegate) logging.Debugf("tryLoadK8sDelegates: Overwrite the cluster default network with %v from pod annotations", delegate)
conf.Delegates[0] = delegate conf.Delegates[0] = delegate

2
k8sclient/k8sclient_test.go
View File

@ -24,8 +24,8 @@ import (
testutils "github.com/intel/multus-cni/testing" testutils "github.com/intel/multus-cni/testing"
"github.com/intel/multus-cni/types"
"github.com/containernetworking/cni/pkg/skel" "github.com/containernetworking/cni/pkg/skel"
"github.com/intel/multus-cni/types"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

6
types/conf.go
View File

@ -27,9 +27,9 @@ import (
) )
const ( const (
defaultCNIDir = "/var/lib/cni/multus" defaultCNIDir = "/var/lib/cni/multus"
defaultConfDir = "/etc/cni/multus/net.d" defaultConfDir = "/etc/cni/multus/net.d"
defaultBinDir = "/opt/cni/bin" defaultBinDir = "/opt/cni/bin"
defaultReadinessIndicatorFile = "" defaultReadinessIndicatorFile = ""
) )

2
types/types.go
View File

@ -74,7 +74,7 @@ type DelegateNetConf struct {
ConfList types.NetConfList ConfList types.NetConfList
IfnameRequest string `json:"ifnameRequest,omitempty"` IfnameRequest string `json:"ifnameRequest,omitempty"`
MacRequest string `json:"macRequest,omitempty"` MacRequest string `json:"macRequest,omitempty"`
IPRequest string `json:"ipRequest,omitempty"` IPRequest string `json:"ipRequest,omitempty"`
// MasterPlugin is only used internal housekeeping // MasterPlugin is only used internal housekeeping
MasterPlugin bool `json:"-"` MasterPlugin bool `json:"-"`
// Conflist plugin is only used internal housekeeping // Conflist plugin is only used internal housekeeping