diff --git a/pkg/kubelet/network/hostport/BUILD b/pkg/kubelet/network/hostport/BUILD index 5a5aeb8d2bc..c210dbea125 100644 --- a/pkg/kubelet/network/hostport/BUILD +++ b/pkg/kubelet/network/hostport/BUILD @@ -19,8 +19,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/proxy/iptables:go_default_library", - "//pkg/util/dbus:go_default_library", - "//pkg/util/exec:go_default_library", "//pkg/util/iptables:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/kubelet/network/hostport/hostport_manager.go b/pkg/kubelet/network/hostport/hostport_manager.go index 1499ff9c664..c2e588cd0e4 100644 --- a/pkg/kubelet/network/hostport/hostport_manager.go +++ b/pkg/kubelet/network/hostport/hostport_manager.go @@ -27,8 +27,6 @@ import ( "github.com/golang/glog" utilerrors "k8s.io/apimachinery/pkg/util/errors" iptablesproxy "k8s.io/kubernetes/pkg/proxy/iptables" - utildbus "k8s.io/kubernetes/pkg/util/dbus" - utilexec "k8s.io/kubernetes/pkg/util/exec" utiliptables "k8s.io/kubernetes/pkg/util/iptables" ) @@ -51,11 +49,10 @@ type hostportManager struct { mu sync.Mutex } -func NewHostportManager() HostPortManager { - iptInterface := utiliptables.New(utilexec.New(), utildbus.New(), utiliptables.ProtocolIpv4) +func NewHostportManager(iptables utiliptables.Interface) HostPortManager { return &hostportManager{ hostPortMap: make(map[hostport]closeable), - iptables: iptInterface, + iptables: iptables, portOpener: openLocalPort, } } diff --git a/pkg/kubelet/network/hostport/hostport_syncer.go b/pkg/kubelet/network/hostport/hostport_syncer.go index d1c577dbdae..03cca1a8d80 100644 --- a/pkg/kubelet/network/hostport/hostport_syncer.go +++ b/pkg/kubelet/network/hostport/hostport_syncer.go @@ -27,8 +27,6 @@ import ( "github.com/golang/glog" iptablesproxy "k8s.io/kubernetes/pkg/proxy/iptables" - utildbus "k8s.io/kubernetes/pkg/util/dbus" - utilexec "k8s.io/kubernetes/pkg/util/exec" utiliptables "k8s.io/kubernetes/pkg/util/iptables" ) @@ -49,11 +47,10 @@ type hostportSyncer struct { portOpener hostportOpener } -func NewHostportSyncer() HostportSyncer { - iptInterface := utiliptables.New(utilexec.New(), utildbus.New(), utiliptables.ProtocolIpv4) +func NewHostportSyncer(iptables utiliptables.Interface) HostportSyncer { return &hostportSyncer{ hostPortMap: make(map[hostport]closeable), - iptables: iptInterface, + iptables: iptables, portOpener: openLocalPort, } } diff --git a/pkg/kubelet/network/kubenet/kubenet_linux.go b/pkg/kubelet/network/kubenet/kubenet_linux.go index fcbe192ca9a..81aa2373b84 100644 --- a/pkg/kubelet/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/network/kubenet/kubenet_linux.go @@ -118,8 +118,8 @@ func NewPlugin(networkPluginDir string) network.NetworkPlugin { iptables: iptInterface, sysctl: sysctl, vendorDir: networkPluginDir, - hostportSyncer: hostport.NewHostportSyncer(), - hostportManager: hostport.NewHostportManager(), + hostportSyncer: hostport.NewHostportSyncer(iptInterface), + hostportManager: hostport.NewHostportManager(iptInterface), nonMasqueradeCIDR: "10.0.0.0/8", } }