diff --git a/pkg/kubelet/network/cni/cni.go b/pkg/kubelet/network/cni/cni.go index 584baeed490..03edbbaf6eb 100644 --- a/pkg/kubelet/network/cni/cni.go +++ b/pkg/kubelet/network/cni/cni.go @@ -38,6 +38,8 @@ const ( ) type cniNetworkPlugin struct { + network.NoopNetworkPlugin + defaultNetwork *cniNetwork host network.Host } @@ -96,9 +98,6 @@ func (plugin *cniNetworkPlugin) Init(host network.Host) error { return nil } -func (plugin *cniNetworkPlugin) Event(name string, details map[string]interface{}) { -} - func (plugin *cniNetworkPlugin) Name() string { return CNIPluginName } diff --git a/pkg/kubelet/network/exec/exec.go b/pkg/kubelet/network/exec/exec.go index 52d895d9962..24e8478400a 100644 --- a/pkg/kubelet/network/exec/exec.go +++ b/pkg/kubelet/network/exec/exec.go @@ -72,6 +72,8 @@ import ( ) type execNetworkPlugin struct { + network.NoopNetworkPlugin + execName string execPath string host network.Host @@ -120,9 +122,6 @@ func (plugin *execNetworkPlugin) getExecutable() string { return path.Join(plugin.execPath, execName) } -func (plugin *execNetworkPlugin) Event(name string, details map[string]interface{}) { -} - func (plugin *execNetworkPlugin) Name() string { return plugin.execName } diff --git a/pkg/kubelet/network/kubenet/kubenet_linux.go b/pkg/kubelet/network/kubenet/kubenet_linux.go index 92826d036e5..c601d382c21 100644 --- a/pkg/kubelet/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/network/kubenet/kubenet_linux.go @@ -41,6 +41,8 @@ const ( ) type kubenetNetworkPlugin struct { + network.NoopNetworkPlugin + host network.Host netConfig *libcni.NetworkConfig cniConfig *libcni.CNIConfig diff --git a/pkg/kubelet/network/kubenet/kubenet_unsupported.go b/pkg/kubelet/network/kubenet/kubenet_unsupported.go index 751db291370..05ef445e076 100644 --- a/pkg/kubelet/network/kubenet/kubenet_unsupported.go +++ b/pkg/kubelet/network/kubenet/kubenet_unsupported.go @@ -26,6 +26,7 @@ import ( ) type kubenetNetworkPlugin struct { + network.NoopNetworkPlugin } func NewPlugin() network.NetworkPlugin { @@ -35,8 +36,6 @@ func NewPlugin() network.NetworkPlugin { func (plugin *kubenetNetworkPlugin) Init(host network.Host) error { return fmt.Errorf("Kubenet is not supported in this build") } -func (plugin *kubenetNetworkPlugin) Event(name string, details map[string]interface{}) { -} func (plugin *kubenetNetworkPlugin) Name() string { return "kubenet" diff --git a/pkg/kubelet/network/plugins.go b/pkg/kubelet/network/plugins.go index dc56d9caee4..e45515a2aad 100644 --- a/pkg/kubelet/network/plugins.go +++ b/pkg/kubelet/network/plugins.go @@ -94,7 +94,7 @@ type Host interface { func InitNetworkPlugin(plugins []NetworkPlugin, networkPluginName string, host Host) (NetworkPlugin, error) { if networkPluginName == "" { // default to the no_op plugin - plug := &noopNetworkPlugin{} + plug := &NoopNetworkPlugin{} if err := plug.Init(host); err != nil { return nil, err } @@ -137,12 +137,12 @@ func UnescapePluginName(in string) string { return strings.Replace(in, "~", "/", -1) } -type noopNetworkPlugin struct { +type NoopNetworkPlugin struct { } const sysctlBridgeCallIptables = "net/bridge/bridge-nf-call-iptables" -func (plugin *noopNetworkPlugin) Init(host Host) error { +func (plugin *NoopNetworkPlugin) Init(host Host) error { // Set bridge-nf-call-iptables=1 to maintain compatibility with older // kubernetes versions to ensure the iptables-based kube proxy functions // correctly. Other plugins are responsible for setting this correctly @@ -159,21 +159,21 @@ func (plugin *noopNetworkPlugin) Init(host Host) error { return nil } -func (plugin *noopNetworkPlugin) Event(name string, details map[string]interface{}) { +func (plugin *NoopNetworkPlugin) Event(name string, details map[string]interface{}) { } -func (plugin *noopNetworkPlugin) Name() string { +func (plugin *NoopNetworkPlugin) Name() string { return DefaultPluginName } -func (plugin *noopNetworkPlugin) SetUpPod(namespace string, name string, id kubecontainer.DockerID) error { +func (plugin *NoopNetworkPlugin) SetUpPod(namespace string, name string, id kubecontainer.DockerID) error { return nil } -func (plugin *noopNetworkPlugin) TearDownPod(namespace string, name string, id kubecontainer.DockerID) error { +func (plugin *NoopNetworkPlugin) TearDownPod(namespace string, name string, id kubecontainer.DockerID) error { return nil } -func (plugin *noopNetworkPlugin) Status(namespace string, name string, id kubecontainer.DockerID) (*PodNetworkStatus, error) { +func (plugin *NoopNetworkPlugin) Status(namespace string, name string, id kubecontainer.DockerID) (*PodNetworkStatus, error) { return nil, nil }