From 42398825ed7fac58fc6c4027c8be730398b6d2be Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Fri, 6 Apr 2018 13:51:42 -0700 Subject: [PATCH] Move the kubelet network package down to dockershim With CRI, kubelet no longer sets up networking for the pods. The dockershim package is the rightful owner and the only user of the newtork package. This change moves the package into dockershim to make the distinction obvious, and untangles the codebase. The`network/dns`is kept in the original package since it is only used by kubelet. --- cmd/kubelet/app/plugins.go | 6 +- pkg/kubelet/dockershim/docker_sandbox_test.go | 2 +- pkg/kubelet/dockershim/docker_service.go | 8 +- pkg/kubelet/dockershim/docker_service_test.go | 4 +- pkg/kubelet/dockershim/network/OWNERS | 8 ++ .../{ => dockershim}/network/cni/BUILD | 0 .../{ => dockershim}/network/cni/cni.go | 2 +- .../network/cni/cni_others.go | 2 +- .../{ => dockershim}/network/cni/cni_test.go | 8 +- .../network/cni/cni_windows.go | 2 +- .../network/cni/testing/BUILD | 0 .../network/cni/testing/mock_cni.go | 0 .../{ => dockershim}/network/hairpin/BUILD | 0 .../network/hairpin/hairpin.go | 0 .../network/hairpin/hairpin_test.go | 0 .../{ => dockershim}/network/hostport/BUILD | 0 .../network/hostport/fake_iptables.go | 0 .../network/hostport/fake_iptables_test.go | 0 .../network/hostport/hostport.go | 0 .../network/hostport/hostport_manager.go | 0 .../network/hostport/hostport_manager_test.go | 0 .../network/hostport/hostport_syncer.go | 0 .../network/hostport/hostport_syncer_test.go | 0 .../network/hostport/hostport_test.go | 0 .../network/hostport/testing/BUILD | 0 .../network/hostport/testing/fake.go | 2 +- .../{ => dockershim}/network/kubenet/BUILD | 0 .../network/kubenet/kubenet.go | 0 .../network/kubenet/kubenet_linux.go | 4 +- .../network/kubenet/kubenet_linux_test.go | 8 +- .../network/kubenet/kubenet_unsupported.go | 2 +- .../{ => dockershim}/network/metrics/BUILD | 0 .../network/metrics/metrics.go | 0 .../{ => dockershim}/network/network.go | 0 .../{ => dockershim}/network/plugins.go | 4 +- .../{ => dockershim}/network/testing/BUILD | 0 .../network/testing/fake_host.go | 2 +- .../network/testing/mock_network_plugin.go | 2 +- .../network/testing/plugins_test.go | 2 +- pkg/kubelet/dockershim/security_context.go | 2 +- pkg/kubelet/kubelet_network_test.go | 91 ------------------- pkg/kubelet/stats/helper.go | 8 +- 42 files changed, 45 insertions(+), 124 deletions(-) create mode 100644 pkg/kubelet/dockershim/network/OWNERS rename pkg/kubelet/{ => dockershim}/network/cni/BUILD (100%) rename pkg/kubelet/{ => dockershim}/network/cni/cni.go (99%) rename pkg/kubelet/{ => dockershim}/network/cni/cni_others.go (97%) rename pkg/kubelet/{ => dockershim}/network/cni/cni_test.go (97%) rename pkg/kubelet/{ => dockershim}/network/cni/cni_windows.go (97%) rename pkg/kubelet/{ => dockershim}/network/cni/testing/BUILD (100%) rename pkg/kubelet/{ => dockershim}/network/cni/testing/mock_cni.go (100%) rename pkg/kubelet/{ => dockershim}/network/hairpin/BUILD (100%) rename pkg/kubelet/{ => dockershim}/network/hairpin/hairpin.go (100%) rename pkg/kubelet/{ => dockershim}/network/hairpin/hairpin_test.go (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/BUILD (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/fake_iptables.go (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/fake_iptables_test.go (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/hostport.go (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/hostport_manager.go (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/hostport_manager_test.go (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/hostport_syncer.go (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/hostport_syncer_test.go (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/hostport_test.go (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/testing/BUILD (100%) rename pkg/kubelet/{ => dockershim}/network/hostport/testing/fake.go (95%) rename pkg/kubelet/{ => dockershim}/network/kubenet/BUILD (100%) rename pkg/kubelet/{ => dockershim}/network/kubenet/kubenet.go (100%) rename pkg/kubelet/{ => dockershim}/network/kubenet/kubenet_linux.go (99%) rename pkg/kubelet/{ => dockershim}/network/kubenet/kubenet_linux_test.go (96%) rename pkg/kubelet/{ => dockershim}/network/kubenet/kubenet_unsupported.go (97%) rename pkg/kubelet/{ => dockershim}/network/metrics/BUILD (100%) rename pkg/kubelet/{ => dockershim}/network/metrics/metrics.go (100%) rename pkg/kubelet/{ => dockershim}/network/network.go (100%) rename pkg/kubelet/{ => dockershim}/network/plugins.go (99%) rename pkg/kubelet/{ => dockershim}/network/testing/BUILD (100%) rename pkg/kubelet/{ => dockershim}/network/testing/fake_host.go (96%) rename pkg/kubelet/{ => dockershim}/network/testing/mock_network_plugin.go (98%) rename pkg/kubelet/{ => dockershim}/network/testing/plugins_test.go (99%) diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go index cbb20ba93a..22700b051f 100644 --- a/cmd/kubelet/app/plugins.go +++ b/cmd/kubelet/app/plugins.go @@ -24,9 +24,9 @@ import ( _ "k8s.io/kubernetes/pkg/credentialprovider/gcp" _ "k8s.io/kubernetes/pkg/credentialprovider/rancher" // Network plugins - "k8s.io/kubernetes/pkg/kubelet/network" - "k8s.io/kubernetes/pkg/kubelet/network/cni" - "k8s.io/kubernetes/pkg/kubelet/network/kubenet" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/kubenet" // Volume plugins "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/aws_ebs" diff --git a/pkg/kubelet/dockershim/docker_sandbox_test.go b/pkg/kubelet/dockershim/docker_sandbox_test.go index 609acd0001..e7d3796a88 100644 --- a/pkg/kubelet/dockershim/docker_sandbox_test.go +++ b/pkg/kubelet/dockershim/docker_sandbox_test.go @@ -30,7 +30,7 @@ import ( runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" - "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" "k8s.io/kubernetes/pkg/kubelet/types" ) diff --git a/pkg/kubelet/dockershim/docker_service.go b/pkg/kubelet/dockershim/docker_service.go index 00a115eb05..fe8e84d124 100644 --- a/pkg/kubelet/dockershim/docker_service.go +++ b/pkg/kubelet/dockershim/docker_service.go @@ -33,10 +33,10 @@ import ( kubecm "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/cm" - "k8s.io/kubernetes/pkg/kubelet/network" - "k8s.io/kubernetes/pkg/kubelet/network/cni" - "k8s.io/kubernetes/pkg/kubelet/network/hostport" - "k8s.io/kubernetes/pkg/kubelet/network/kubenet" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/kubenet" "k8s.io/kubernetes/pkg/kubelet/server/streaming" "k8s.io/kubernetes/pkg/kubelet/util/cache" utilstore "k8s.io/kubernetes/pkg/kubelet/util/store" diff --git a/pkg/kubelet/dockershim/docker_service_test.go b/pkg/kubelet/dockershim/docker_service_test.go index 9bbf4cb8f6..0f9724e224 100644 --- a/pkg/kubelet/dockershim/docker_service_test.go +++ b/pkg/kubelet/dockershim/docker_service_test.go @@ -32,8 +32,8 @@ import ( runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" - "k8s.io/kubernetes/pkg/kubelet/network" - nettest "k8s.io/kubernetes/pkg/kubelet/network/testing" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" + nettest "k8s.io/kubernetes/pkg/kubelet/dockershim/network/testing" "k8s.io/kubernetes/pkg/kubelet/util/cache" ) diff --git a/pkg/kubelet/dockershim/network/OWNERS b/pkg/kubelet/dockershim/network/OWNERS new file mode 100644 index 0000000000..cb71f3b3de --- /dev/null +++ b/pkg/kubelet/dockershim/network/OWNERS @@ -0,0 +1,8 @@ +approvers: +- thockin +- dchen1107 +- matchstick +- freehan +reviewers: +- sig-network-reviewers + diff --git a/pkg/kubelet/network/cni/BUILD b/pkg/kubelet/dockershim/network/cni/BUILD similarity index 100% rename from pkg/kubelet/network/cni/BUILD rename to pkg/kubelet/dockershim/network/cni/BUILD diff --git a/pkg/kubelet/network/cni/cni.go b/pkg/kubelet/dockershim/network/cni/cni.go similarity index 99% rename from pkg/kubelet/network/cni/cni.go rename to pkg/kubelet/dockershim/network/cni/cni.go index d9d5bc22e7..776f3eeda8 100644 --- a/pkg/kubelet/network/cni/cni.go +++ b/pkg/kubelet/dockershim/network/cni/cni.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" utilexec "k8s.io/utils/exec" ) diff --git a/pkg/kubelet/network/cni/cni_others.go b/pkg/kubelet/dockershim/network/cni/cni_others.go similarity index 97% rename from pkg/kubelet/network/cni/cni_others.go rename to pkg/kubelet/dockershim/network/cni/cni_others.go index cdc0c1a11f..56f75ca3a9 100644 --- a/pkg/kubelet/network/cni/cni_others.go +++ b/pkg/kubelet/dockershim/network/cni/cni_others.go @@ -23,7 +23,7 @@ import ( "github.com/containernetworking/cni/libcni" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" ) func getLoNetwork(binDirs []string) *cniNetwork { diff --git a/pkg/kubelet/network/cni/cni_test.go b/pkg/kubelet/dockershim/network/cni/cni_test.go similarity index 97% rename from pkg/kubelet/network/cni/cni_test.go rename to pkg/kubelet/dockershim/network/cni/cni_test.go index f1701a22d4..6e23c1cdea 100644 --- a/pkg/kubelet/network/cni/cni_test.go +++ b/pkg/kubelet/dockershim/network/cni/cni_test.go @@ -39,10 +39,10 @@ import ( "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" - "k8s.io/kubernetes/pkg/kubelet/network" - "k8s.io/kubernetes/pkg/kubelet/network/cni/testing" - "k8s.io/kubernetes/pkg/kubelet/network/hostport" - networktest "k8s.io/kubernetes/pkg/kubelet/network/testing" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni/testing" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" + networktest "k8s.io/kubernetes/pkg/kubelet/dockershim/network/testing" "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" ) diff --git a/pkg/kubelet/network/cni/cni_windows.go b/pkg/kubelet/dockershim/network/cni/cni_windows.go similarity index 97% rename from pkg/kubelet/network/cni/cni_windows.go rename to pkg/kubelet/dockershim/network/cni/cni_windows.go index 81cc5ca1fe..82324b9ac5 100644 --- a/pkg/kubelet/network/cni/cni_windows.go +++ b/pkg/kubelet/dockershim/network/cni/cni_windows.go @@ -24,7 +24,7 @@ import ( cniTypes020 "github.com/containernetworking/cni/pkg/types/020" "github.com/golang/glog" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" ) func getLoNetwork(binDirs []string) *cniNetwork { diff --git a/pkg/kubelet/network/cni/testing/BUILD b/pkg/kubelet/dockershim/network/cni/testing/BUILD similarity index 100% rename from pkg/kubelet/network/cni/testing/BUILD rename to pkg/kubelet/dockershim/network/cni/testing/BUILD diff --git a/pkg/kubelet/network/cni/testing/mock_cni.go b/pkg/kubelet/dockershim/network/cni/testing/mock_cni.go similarity index 100% rename from pkg/kubelet/network/cni/testing/mock_cni.go rename to pkg/kubelet/dockershim/network/cni/testing/mock_cni.go diff --git a/pkg/kubelet/network/hairpin/BUILD b/pkg/kubelet/dockershim/network/hairpin/BUILD similarity index 100% rename from pkg/kubelet/network/hairpin/BUILD rename to pkg/kubelet/dockershim/network/hairpin/BUILD diff --git a/pkg/kubelet/network/hairpin/hairpin.go b/pkg/kubelet/dockershim/network/hairpin/hairpin.go similarity index 100% rename from pkg/kubelet/network/hairpin/hairpin.go rename to pkg/kubelet/dockershim/network/hairpin/hairpin.go diff --git a/pkg/kubelet/network/hairpin/hairpin_test.go b/pkg/kubelet/dockershim/network/hairpin/hairpin_test.go similarity index 100% rename from pkg/kubelet/network/hairpin/hairpin_test.go rename to pkg/kubelet/dockershim/network/hairpin/hairpin_test.go diff --git a/pkg/kubelet/network/hostport/BUILD b/pkg/kubelet/dockershim/network/hostport/BUILD similarity index 100% rename from pkg/kubelet/network/hostport/BUILD rename to pkg/kubelet/dockershim/network/hostport/BUILD diff --git a/pkg/kubelet/network/hostport/fake_iptables.go b/pkg/kubelet/dockershim/network/hostport/fake_iptables.go similarity index 100% rename from pkg/kubelet/network/hostport/fake_iptables.go rename to pkg/kubelet/dockershim/network/hostport/fake_iptables.go diff --git a/pkg/kubelet/network/hostport/fake_iptables_test.go b/pkg/kubelet/dockershim/network/hostport/fake_iptables_test.go similarity index 100% rename from pkg/kubelet/network/hostport/fake_iptables_test.go rename to pkg/kubelet/dockershim/network/hostport/fake_iptables_test.go diff --git a/pkg/kubelet/network/hostport/hostport.go b/pkg/kubelet/dockershim/network/hostport/hostport.go similarity index 100% rename from pkg/kubelet/network/hostport/hostport.go rename to pkg/kubelet/dockershim/network/hostport/hostport.go diff --git a/pkg/kubelet/network/hostport/hostport_manager.go b/pkg/kubelet/dockershim/network/hostport/hostport_manager.go similarity index 100% rename from pkg/kubelet/network/hostport/hostport_manager.go rename to pkg/kubelet/dockershim/network/hostport/hostport_manager.go diff --git a/pkg/kubelet/network/hostport/hostport_manager_test.go b/pkg/kubelet/dockershim/network/hostport/hostport_manager_test.go similarity index 100% rename from pkg/kubelet/network/hostport/hostport_manager_test.go rename to pkg/kubelet/dockershim/network/hostport/hostport_manager_test.go diff --git a/pkg/kubelet/network/hostport/hostport_syncer.go b/pkg/kubelet/dockershim/network/hostport/hostport_syncer.go similarity index 100% rename from pkg/kubelet/network/hostport/hostport_syncer.go rename to pkg/kubelet/dockershim/network/hostport/hostport_syncer.go diff --git a/pkg/kubelet/network/hostport/hostport_syncer_test.go b/pkg/kubelet/dockershim/network/hostport/hostport_syncer_test.go similarity index 100% rename from pkg/kubelet/network/hostport/hostport_syncer_test.go rename to pkg/kubelet/dockershim/network/hostport/hostport_syncer_test.go diff --git a/pkg/kubelet/network/hostport/hostport_test.go b/pkg/kubelet/dockershim/network/hostport/hostport_test.go similarity index 100% rename from pkg/kubelet/network/hostport/hostport_test.go rename to pkg/kubelet/dockershim/network/hostport/hostport_test.go diff --git a/pkg/kubelet/network/hostport/testing/BUILD b/pkg/kubelet/dockershim/network/hostport/testing/BUILD similarity index 100% rename from pkg/kubelet/network/hostport/testing/BUILD rename to pkg/kubelet/dockershim/network/hostport/testing/BUILD diff --git a/pkg/kubelet/network/hostport/testing/fake.go b/pkg/kubelet/dockershim/network/hostport/testing/fake.go similarity index 95% rename from pkg/kubelet/network/hostport/testing/fake.go rename to pkg/kubelet/dockershim/network/hostport/testing/fake.go index 1d0a78f0b5..1d14c02ed9 100644 --- a/pkg/kubelet/network/hostport/testing/fake.go +++ b/pkg/kubelet/dockershim/network/hostport/testing/fake.go @@ -19,7 +19,7 @@ package testing import ( "fmt" - "k8s.io/kubernetes/pkg/kubelet/network/hostport" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" ) type fakeSyncer struct{} diff --git a/pkg/kubelet/network/kubenet/BUILD b/pkg/kubelet/dockershim/network/kubenet/BUILD similarity index 100% rename from pkg/kubelet/network/kubenet/BUILD rename to pkg/kubelet/dockershim/network/kubenet/BUILD diff --git a/pkg/kubelet/network/kubenet/kubenet.go b/pkg/kubelet/dockershim/network/kubenet/kubenet.go similarity index 100% rename from pkg/kubelet/network/kubenet/kubenet.go rename to pkg/kubelet/dockershim/network/kubenet/kubenet.go diff --git a/pkg/kubelet/network/kubenet/kubenet_linux.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go similarity index 99% rename from pkg/kubelet/network/kubenet/kubenet_linux.go rename to pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go index 0d2240d579..cba59b40fd 100644 --- a/pkg/kubelet/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go @@ -37,8 +37,8 @@ import ( utilsets "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/network" - "k8s.io/kubernetes/pkg/kubelet/network/hostport" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" "k8s.io/kubernetes/pkg/util/bandwidth" utildbus "k8s.io/kubernetes/pkg/util/dbus" utilebtables "k8s.io/kubernetes/pkg/util/ebtables" diff --git a/pkg/kubelet/network/kubenet/kubenet_linux_test.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go similarity index 96% rename from pkg/kubelet/network/kubenet/kubenet_linux_test.go rename to pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go index 01f6a04b33..f9fd4067fe 100644 --- a/pkg/kubelet/network/kubenet/kubenet_linux_test.go +++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go @@ -26,10 +26,10 @@ import ( "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/network" - "k8s.io/kubernetes/pkg/kubelet/network/cni/testing" - hostporttest "k8s.io/kubernetes/pkg/kubelet/network/hostport/testing" - nettest "k8s.io/kubernetes/pkg/kubelet/network/testing" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni/testing" + hostporttest "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport/testing" + nettest "k8s.io/kubernetes/pkg/kubelet/dockershim/network/testing" "k8s.io/kubernetes/pkg/util/bandwidth" ipttest "k8s.io/kubernetes/pkg/util/iptables/testing" sysctltest "k8s.io/kubernetes/pkg/util/sysctl/testing" diff --git a/pkg/kubelet/network/kubenet/kubenet_unsupported.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go similarity index 97% rename from pkg/kubelet/network/kubenet/kubenet_unsupported.go rename to pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go index ba2ee3f531..3fb4f966e6 100644 --- a/pkg/kubelet/network/kubenet/kubenet_unsupported.go +++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" ) type kubenetNetworkPlugin struct { diff --git a/pkg/kubelet/network/metrics/BUILD b/pkg/kubelet/dockershim/network/metrics/BUILD similarity index 100% rename from pkg/kubelet/network/metrics/BUILD rename to pkg/kubelet/dockershim/network/metrics/BUILD diff --git a/pkg/kubelet/network/metrics/metrics.go b/pkg/kubelet/dockershim/network/metrics/metrics.go similarity index 100% rename from pkg/kubelet/network/metrics/metrics.go rename to pkg/kubelet/dockershim/network/metrics/metrics.go diff --git a/pkg/kubelet/network/network.go b/pkg/kubelet/dockershim/network/network.go similarity index 100% rename from pkg/kubelet/network/network.go rename to pkg/kubelet/dockershim/network/network.go diff --git a/pkg/kubelet/network/plugins.go b/pkg/kubelet/dockershim/network/plugins.go similarity index 99% rename from pkg/kubelet/network/plugins.go rename to pkg/kubelet/dockershim/network/plugins.go index 68ce21c18c..21111fa756 100644 --- a/pkg/kubelet/network/plugins.go +++ b/pkg/kubelet/dockershim/network/plugins.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/network/hostport" - "k8s.io/kubernetes/pkg/kubelet/network/metrics" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/metrics" utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" utilexec "k8s.io/utils/exec" ) diff --git a/pkg/kubelet/network/testing/BUILD b/pkg/kubelet/dockershim/network/testing/BUILD similarity index 100% rename from pkg/kubelet/network/testing/BUILD rename to pkg/kubelet/dockershim/network/testing/BUILD diff --git a/pkg/kubelet/network/testing/fake_host.go b/pkg/kubelet/dockershim/network/testing/fake_host.go similarity index 96% rename from pkg/kubelet/network/testing/fake_host.go rename to pkg/kubelet/dockershim/network/testing/fake_host.go index ca9999ff23..71dbf1d072 100644 --- a/pkg/kubelet/network/testing/fake_host.go +++ b/pkg/kubelet/dockershim/network/testing/fake_host.go @@ -24,7 +24,7 @@ import ( clientset "k8s.io/client-go/kubernetes" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" - "k8s.io/kubernetes/pkg/kubelet/network/hostport" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" ) type fakeNetworkHost struct { diff --git a/pkg/kubelet/network/testing/mock_network_plugin.go b/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go similarity index 98% rename from pkg/kubelet/network/testing/mock_network_plugin.go rename to pkg/kubelet/dockershim/network/testing/mock_network_plugin.go index a13712f206..72fc56f897 100644 --- a/pkg/kubelet/network/testing/mock_network_plugin.go +++ b/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go @@ -25,7 +25,7 @@ import ( sets "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" container "k8s.io/kubernetes/pkg/kubelet/container" - network "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" ) // Mock of NetworkPlugin interface diff --git a/pkg/kubelet/network/testing/plugins_test.go b/pkg/kubelet/dockershim/network/testing/plugins_test.go similarity index 99% rename from pkg/kubelet/network/testing/plugins_test.go rename to pkg/kubelet/dockershim/network/testing/plugins_test.go index 6398948fa3..59772e0518 100644 --- a/pkg/kubelet/network/testing/plugins_test.go +++ b/pkg/kubelet/dockershim/network/testing/plugins_test.go @@ -25,7 +25,7 @@ import ( utilsets "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/dockershim/network" sysctltest "k8s.io/kubernetes/pkg/util/sysctl/testing" "github.com/golang/mock/gomock" diff --git a/pkg/kubelet/dockershim/security_context.go b/pkg/kubelet/dockershim/security_context.go index 28b420b678..d060144cb5 100644 --- a/pkg/kubelet/dockershim/security_context.go +++ b/pkg/kubelet/dockershim/security_context.go @@ -25,7 +25,7 @@ import ( dockercontainer "github.com/docker/docker/api/types/container" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" - knetwork "k8s.io/kubernetes/pkg/kubelet/network" + knetwork "k8s.io/kubernetes/pkg/kubelet/dockershim/network" ) // applySandboxSecurityContext updates docker sandbox options according to security context. diff --git a/pkg/kubelet/kubelet_network_test.go b/pkg/kubelet/kubelet_network_test.go index ed63cfcea9..7e611766c4 100644 --- a/pkg/kubelet/kubelet_network_test.go +++ b/pkg/kubelet/kubelet_network_test.go @@ -22,97 +22,6 @@ import ( "github.com/stretchr/testify/assert" ) -func TestNodeIPParam(t *testing.T) { - type test struct { - nodeIP string - success bool - testName string - } - tests := []test{ - { - nodeIP: "", - success: false, - testName: "IP not set", - }, - { - nodeIP: "127.0.0.1", - success: false, - testName: "IPv4 loopback address", - }, - { - nodeIP: "::1", - success: false, - testName: "IPv6 loopback address", - }, - { - nodeIP: "224.0.0.1", - success: false, - testName: "multicast IPv4 address", - }, - { - nodeIP: "ff00::1", - success: false, - testName: "multicast IPv6 address", - }, - { - nodeIP: "169.254.0.1", - success: false, - testName: "IPv4 link-local unicast address", - }, - { - nodeIP: "fe80::0202:b3ff:fe1e:8329", - success: false, - testName: "IPv6 link-local unicast address", - }, - { - nodeIP: "0.0.0.0", - success: false, - testName: "Unspecified IPv4 address", - }, - { - nodeIP: "::", - success: false, - testName: "Unspecified IPv6 address", - }, - { - nodeIP: "1.2.3.4", - success: false, - testName: "IPv4 address that doesn't belong to host", - }, - } - addrs, err := net.InterfaceAddrs() - if err != nil { - assert.Error(t, err, fmt.Sprintf( - "Unable to obtain a list of the node's unicast interface addresses.")) - } - for _, addr := range addrs { - var ip net.IP - switch v := addr.(type) { - case *net.IPNet: - ip = v.IP - case *net.IPAddr: - ip = v.IP - } - if ip.IsLoopback() || ip.IsLinkLocalUnicast() { - break - } - successTest := test{ - nodeIP: ip.String(), - success: true, - testName: fmt.Sprintf("Success test case for address %s", ip.String()), - } - tests = append(tests, successTest) - } - for _, test := range tests { - err := validateNodeIP(net.ParseIP(test.nodeIP)) - if test.success { - assert.NoError(t, err, "test %s", test.testName) - } else { - assert.Error(t, err, fmt.Sprintf("test %s", test.testName)) - } - } -} - func TestGetIPTablesMark(t *testing.T) { tests := []struct { bit int diff --git a/pkg/kubelet/stats/helper.go b/pkg/kubelet/stats/helper.go index cee923722a..77f3a6569e 100644 --- a/pkg/kubelet/stats/helper.go +++ b/pkg/kubelet/stats/helper.go @@ -27,9 +27,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" - "k8s.io/kubernetes/pkg/kubelet/network" ) +// defaultNetworkInterfaceName is used for collectng network stats. +// This logic relies on knowledge of the container runtime implementation and +// is not reliable. +const defaultNetworkInterfaceName = "eth0" + func cadvisorInfoToCPUandMemoryStats(info *cadvisorapiv2.ContainerInfo) (*statsapi.CPUStats, *statsapi.MemoryStats) { cstat, found := latestContainerStats(info) if !found { @@ -153,7 +157,7 @@ func cadvisorInfoToNetworkStats(name string, info *cadvisorapiv2.ContainerInfo) TxErrors: &inter.TxErrors, } - if inter.Name == network.DefaultInterfaceName { + if inter.Name == defaultNetworkInterfaceName { iStats.InterfaceStats = iStat }