Replace godep with dep

vendor/k8s.io/kubernetes/pkg/kubelet/network/testing/BUILD

@@ -0,0 +1,52 @@
+package(default_visibility = ["//visibility:public"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+    "go_test",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "fake_host.go",
+        "mock_network_plugin.go",
+    ],
+    deps = [
+        "//pkg/kubelet/apis/kubeletconfig:go_default_library",
+        "//pkg/kubelet/container:go_default_library",
+        "//pkg/kubelet/container/testing:go_default_library",
+        "//pkg/kubelet/network:go_default_library",
+        "//pkg/kubelet/network/hostport:go_default_library",
+        "//vendor/github.com/golang/mock/gomock:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
+    ],
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = ["plugins_test.go"],
+    library = ":go_default_library",
+    deps = [
+        "//pkg/kubelet/apis/kubeletconfig:go_default_library",
+        "//pkg/kubelet/container:go_default_library",
+        "//pkg/kubelet/network:go_default_library",
+        "//vendor/github.com/golang/mock/gomock:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)

vendor/k8s.io/kubernetes/pkg/kubelet/network/testing/fake_host.go

@@ -0,0 +1,73 @@
+/*
+Copyright 2014 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package testing
+
+// helper for testing plugins
+// a fake host is created here that can be used by plugins for testing
+
+import (
+	"k8s.io/api/core/v1"
+	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"
+)
+
+type fakeNetworkHost struct {
+	fakeNamespaceGetter
+	FakePortMappingGetter
+	kubeClient clientset.Interface
+	Legacy     bool
+	Runtime    *containertest.FakeRuntime
+}
+
+func NewFakeHost(kubeClient clientset.Interface) *fakeNetworkHost {
+	host := &fakeNetworkHost{kubeClient: kubeClient, Legacy: true, Runtime: &containertest.FakeRuntime{}}
+	return host
+}
+
+func (fnh *fakeNetworkHost) GetPodByName(name, namespace string) (*v1.Pod, bool) {
+	return nil, false
+}
+
+func (fnh *fakeNetworkHost) GetKubeClient() clientset.Interface {
+	return nil
+}
+
+func (nh *fakeNetworkHost) GetRuntime() kubecontainer.Runtime {
+	return nh.Runtime
+}
+
+func (nh *fakeNetworkHost) SupportsLegacyFeatures() bool {
+	return nh.Legacy
+}
+
+type fakeNamespaceGetter struct {
+	ns string
+}
+
+func (nh *fakeNamespaceGetter) GetNetNS(containerID string) (string, error) {
+	return nh.ns, nil
+}
+
+type FakePortMappingGetter struct {
+	PortMaps map[string][]*hostport.PortMapping
+}
+
+func (pm *FakePortMappingGetter) GetPodPortMappings(containerID string) ([]*hostport.PortMapping, error) {
+	return pm.PortMaps[containerID], nil
+}

vendor/k8s.io/kubernetes/pkg/kubelet/network/testing/mock_network_plugin.go

@@ -0,0 +1,133 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Generated code, generated via: `mockgen k8s.io/kubernetes/pkg/kubelet/network NetworkPlugin > $GOPATH/src/k8s.io/kubernetes/pkg/kubelet/network/testing/mock_network_plugin.go`
+// Edited by hand for boilerplate and gofmt.
+// TODO, this should be autogenerated/autoupdated by scripts.
+
+package testing
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	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"
+)
+
+// Mock of NetworkPlugin interface
+type MockNetworkPlugin struct {
+	ctrl     *gomock.Controller
+	recorder *_MockNetworkPluginRecorder
+}
+
+// Recorder for MockNetworkPlugin (not exported)
+type _MockNetworkPluginRecorder struct {
+	mock *MockNetworkPlugin
+}
+
+func NewMockNetworkPlugin(ctrl *gomock.Controller) *MockNetworkPlugin {
+	mock := &MockNetworkPlugin{ctrl: ctrl}
+	mock.recorder = &_MockNetworkPluginRecorder{mock}
+	return mock
+}
+
+func (_m *MockNetworkPlugin) EXPECT() *_MockNetworkPluginRecorder {
+	return _m.recorder
+}
+
+func (_m *MockNetworkPlugin) Capabilities() sets.Int {
+	ret := _m.ctrl.Call(_m, "Capabilities")
+	ret0, _ := ret[0].(sets.Int)
+	return ret0
+}
+
+func (_m *MockNetworkPlugin) Finish() {
+	_m.ctrl.Finish()
+}
+
+func (_mr *_MockNetworkPluginRecorder) Capabilities() *gomock.Call {
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "Capabilities")
+}
+
+func (_m *MockNetworkPlugin) Event(_param0 string, _param1 map[string]interface{}) {
+	_m.ctrl.Call(_m, "Event", _param0, _param1)
+}
+
+func (_mr *_MockNetworkPluginRecorder) Event(arg0, arg1 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "Event", arg0, arg1)
+}
+
+func (_m *MockNetworkPlugin) GetPodNetworkStatus(_param0 string, _param1 string, _param2 container.ContainerID) (*network.PodNetworkStatus, error) {
+	ret := _m.ctrl.Call(_m, "GetPodNetworkStatus", _param0, _param1, _param2)
+	ret0, _ := ret[0].(*network.PodNetworkStatus)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+func (_mr *_MockNetworkPluginRecorder) GetPodNetworkStatus(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetPodNetworkStatus", arg0, arg1, arg2)
+}
+
+func (_m *MockNetworkPlugin) Init(_param0 network.Host, _param1 kubeletconfig.HairpinMode, nonMasqueradeCIDR string, mtu int) error {
+	ret := _m.ctrl.Call(_m, "Init", _param0, _param1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+func (_mr *_MockNetworkPluginRecorder) Init(arg0, arg1 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "Init", arg0, arg1)
+}
+
+func (_m *MockNetworkPlugin) Name() string {
+	ret := _m.ctrl.Call(_m, "Name")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+func (_mr *_MockNetworkPluginRecorder) Name() *gomock.Call {
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "Name")
+}
+
+func (_m *MockNetworkPlugin) SetUpPod(_param0 string, _param1 string, _param2 container.ContainerID, annotations map[string]string) error {
+	ret := _m.ctrl.Call(_m, "SetUpPod", _param0, _param1, _param2)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+func (_mr *_MockNetworkPluginRecorder) SetUpPod(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "SetUpPod", arg0, arg1, arg2)
+}
+
+func (_m *MockNetworkPlugin) Status() error {
+	ret := _m.ctrl.Call(_m, "Status")
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+func (_mr *_MockNetworkPluginRecorder) Status() *gomock.Call {
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "Status")
+}
+
+func (_m *MockNetworkPlugin) TearDownPod(_param0 string, _param1 string, _param2 container.ContainerID) error {
+	ret := _m.ctrl.Call(_m, "TearDownPod", _param0, _param1, _param2)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+func (_mr *_MockNetworkPluginRecorder) TearDownPod(arg0, arg1, arg2 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "TearDownPod", arg0, arg1, arg2)
+}

vendor/k8s.io/kubernetes/pkg/kubelet/network/testing/plugins_test.go

@@ -0,0 +1,218 @@
+/*
+Copyright 2014 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package testing
+
+import (
+	"fmt"
+	"net"
+	"sync"
+	"testing"
+
+	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"
+
+	"github.com/golang/mock/gomock"
+)
+
+func TestSelectDefaultPlugin(t *testing.T) {
+	all_plugins := []network.NetworkPlugin{}
+	plug, err := network.InitNetworkPlugin(all_plugins, "", NewFakeHost(nil), kubeletconfig.HairpinNone, "10.0.0.0/8", network.UseDefaultMTU)
+	if err != nil {
+		t.Fatalf("Unexpected error in selecting default plugin: %v", err)
+	}
+	if plug == nil {
+		t.Fatalf("Failed to select the default plugin.")
+	}
+	if plug.Name() != network.DefaultPluginName {
+		t.Errorf("Failed to select the default plugin. Expected %s. Got %s", network.DefaultPluginName, plug.Name())
+	}
+}
+
+func TestPluginManager(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	fnp := NewMockNetworkPlugin(ctrl)
+	defer fnp.Finish()
+	pm := network.NewPluginManager(fnp)
+
+	fnp.EXPECT().Name().Return("someNetworkPlugin").AnyTimes()
+
+	allCreatedWg := sync.WaitGroup{}
+	allCreatedWg.Add(1)
+	allDoneWg := sync.WaitGroup{}
+
+	// 10 pods, 4 setup/status/teardown runs each.  Ensure that network locking
+	// works and the pod map isn't concurrently accessed
+	for i := 0; i < 10; i++ {
+		podName := fmt.Sprintf("pod%d", i)
+		containerID := kubecontainer.ContainerID{ID: podName}
+
+		fnp.EXPECT().SetUpPod("", podName, containerID).Return(nil).Times(4)
+		fnp.EXPECT().GetPodNetworkStatus("", podName, containerID).Return(&network.PodNetworkStatus{IP: net.ParseIP("1.2.3.4")}, nil).Times(4)
+		fnp.EXPECT().TearDownPod("", podName, containerID).Return(nil).Times(4)
+
+		for x := 0; x < 4; x++ {
+			allDoneWg.Add(1)
+			go func(name string, id kubecontainer.ContainerID, num int) {
+				defer allDoneWg.Done()
+
+				// Block all goroutines from running until all have
+				// been created and are ready.  This ensures we
+				// have more pod network operations running
+				// concurrently.
+				allCreatedWg.Wait()
+
+				if err := pm.SetUpPod("", name, id, nil); err != nil {
+					t.Errorf("Failed to set up pod %q: %v", name, err)
+					return
+				}
+
+				if _, err := pm.GetPodNetworkStatus("", name, id); err != nil {
+					t.Errorf("Failed to inspect pod %q: %v", name, err)
+					return
+				}
+
+				if err := pm.TearDownPod("", name, id); err != nil {
+					t.Errorf("Failed to tear down pod %q: %v", name, err)
+					return
+				}
+			}(podName, containerID, x)
+		}
+	}
+	// Block all goroutines from running until all have been created and started
+	allCreatedWg.Done()
+
+	// Wait for them all to finish
+	allDoneWg.Wait()
+}
+
+type hookableFakeNetworkPluginSetupHook func(namespace, name string, id kubecontainer.ContainerID)
+
+type hookableFakeNetworkPlugin struct {
+	setupHook hookableFakeNetworkPluginSetupHook
+}
+
+func newHookableFakeNetworkPlugin(setupHook hookableFakeNetworkPluginSetupHook) *hookableFakeNetworkPlugin {
+	return &hookableFakeNetworkPlugin{
+		setupHook: setupHook,
+	}
+}
+
+func (p *hookableFakeNetworkPlugin) Init(host network.Host, hairpinMode kubeletconfig.HairpinMode, nonMasqueradeCIDR string, mtu int) error {
+	return nil
+}
+
+func (p *hookableFakeNetworkPlugin) Event(name string, details map[string]interface{}) {
+}
+
+func (p *hookableFakeNetworkPlugin) Name() string {
+	return "fakeplugin"
+}
+
+func (p *hookableFakeNetworkPlugin) Capabilities() utilsets.Int {
+	return utilsets.NewInt()
+}
+
+func (p *hookableFakeNetworkPlugin) SetUpPod(namespace string, name string, id kubecontainer.ContainerID, annotations map[string]string) error {
+	if p.setupHook != nil {
+		p.setupHook(namespace, name, id)
+	}
+	return nil
+}
+
+func (p *hookableFakeNetworkPlugin) TearDownPod(string, string, kubecontainer.ContainerID) error {
+	return nil
+}
+
+func (p *hookableFakeNetworkPlugin) GetPodNetworkStatus(string, string, kubecontainer.ContainerID) (*network.PodNetworkStatus, error) {
+	return &network.PodNetworkStatus{IP: net.ParseIP("10.1.2.3")}, nil
+}
+
+func (p *hookableFakeNetworkPlugin) Status() error {
+	return nil
+}
+
+// Ensure that one pod's network operations don't block another's.  If the
+// test is successful (eg, first pod doesn't block on second) the test
+// will complete.  If unsuccessful, it will hang and get killed.
+func TestMultiPodParallelNetworkOps(t *testing.T) {
+	podWg := sync.WaitGroup{}
+	podWg.Add(1)
+
+	// Can't do this with MockNetworkPlugin because the gomock controller
+	// has its own locks which don't allow the parallel network operation
+	// to proceed.
+	didWait := false
+	fakePlugin := newHookableFakeNetworkPlugin(func(podNamespace, podName string, id kubecontainer.ContainerID) {
+		if podName == "waiter" {
+			podWg.Wait()
+			didWait = true
+		}
+	})
+	pm := network.NewPluginManager(fakePlugin)
+
+	opsWg := sync.WaitGroup{}
+
+	// Start the pod that will wait for the other to complete
+	opsWg.Add(1)
+	go func() {
+		defer opsWg.Done()
+
+		podName := "waiter"
+		containerID := kubecontainer.ContainerID{ID: podName}
+
+		// Setup will block on the runner pod completing.  If network
+		// operations locking isn't correct (eg pod network operations
+		// block other pods) setUpPod() will never return.
+		if err := pm.SetUpPod("", podName, containerID, nil); err != nil {
+			t.Errorf("Failed to set up waiter pod: %v", err)
+			return
+		}
+
+		if err := pm.TearDownPod("", podName, containerID); err != nil {
+			t.Errorf("Failed to tear down waiter pod: %v", err)
+			return
+		}
+	}()
+
+	opsWg.Add(1)
+	go func() {
+		defer opsWg.Done()
+		// Let other pod proceed
+		defer podWg.Done()
+
+		podName := "runner"
+		containerID := kubecontainer.ContainerID{ID: podName}
+
+		if err := pm.SetUpPod("", podName, containerID, nil); err != nil {
+			t.Errorf("Failed to set up runner pod: %v", err)
+			return
+		}
+
+		if err := pm.TearDownPod("", podName, containerID); err != nil {
+			t.Errorf("Failed to tear down runner pod: %v", err)
+			return
+		}
+	}()
+
+	opsWg.Wait()
+
+	if !didWait {
+		t.Errorf("waiter pod didn't wait for runner pod!")
+	}
+}