Merge pull request #4335 from wackxu/fixedgemark

fix edgemark not work for new edged 

3 files changed, 217 insertions, 0 deletions

diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/testing/cadvisor_fake.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/testing/cadvisor_fake.go
new file mode 100644
index 000000000..6d4f4fb2b
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/testing/cadvisor_fake.go
@@ -0,0 +1,112 @@
+/*
+Copyright 2015 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 (
+	"github.com/google/cadvisor/events"
+	cadvisorapi "github.com/google/cadvisor/info/v1"
+	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
+	"k8s.io/kubernetes/pkg/kubelet/cadvisor"
+)
+
+// Fake cadvisor.Interface implementation.
+type Fake struct {
+	NodeName string
+}
+
+const (
+	// FakeKernelVersion is a fake kernel version for testing.
+	FakeKernelVersion = "3.16.0-0.bpo.4-amd64"
+	// FakeContainerOSVersion is a fake OS version for testing.
+	FakeContainerOSVersion = "Debian GNU/Linux 7 (wheezy)"
+
+	fakeNumCores       = 1
+	fakeMemoryCapacity = 4026531840
+	fakeDockerVersion  = "1.13.1"
+)
+
+var _ cadvisor.Interface = new(Fake)
+
+// Start is a fake implementation of Interface.Start.
+func (c *Fake) Start() error {
+	return nil
+}
+
+// ContainerInfo is a fake implementation of Interface.ContainerInfo.
+func (c *Fake) ContainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (*cadvisorapi.ContainerInfo, error) {
+	return new(cadvisorapi.ContainerInfo), nil
+}
+
+// ContainerInfoV2 is a fake implementation of Interface.ContainerInfoV2.
+func (c *Fake) ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions) (map[string]cadvisorapiv2.ContainerInfo, error) {
+	return map[string]cadvisorapiv2.ContainerInfo{}, nil
+}
+
+// GetRequestedContainersInfo is a fake implementation if Interface.GetRequestedContainersInfo
+func (c *Fake) GetRequestedContainersInfo(containerName string, options cadvisorapiv2.RequestOptions) (map[string]*cadvisorapi.ContainerInfo, error) {
+	return map[string]*cadvisorapi.ContainerInfo{}, nil
+}
+
+// SubcontainerInfo is a fake implementation of Interface.SubcontainerInfo.
+func (c *Fake) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) {
+	return map[string]*cadvisorapi.ContainerInfo{}, nil
+}
+
+// DockerContainer is a fake implementation of Interface.DockerContainer.
+func (c *Fake) DockerContainer(name string, req *cadvisorapi.ContainerInfoRequest) (cadvisorapi.ContainerInfo, error) {
+	return cadvisorapi.ContainerInfo{}, nil
+}
+
+// MachineInfo is a fake implementation of Interface.MachineInfo.
+func (c *Fake) MachineInfo() (*cadvisorapi.MachineInfo, error) {
+	// Simulate a machine with 1 core and 3.75GB of memory.
+	// We set it to non-zero values to make non-zero-capacity machines in Kubemark.
+	return &cadvisorapi.MachineInfo{
+		NumCores:       fakeNumCores,
+		InstanceID:     cadvisorapi.InstanceID(c.NodeName),
+		MemoryCapacity: fakeMemoryCapacity,
+	}, nil
+}
+
+// VersionInfo is a fake implementation of Interface.VersionInfo.
+func (c *Fake) VersionInfo() (*cadvisorapi.VersionInfo, error) {
+	return &cadvisorapi.VersionInfo{
+		KernelVersion:      FakeKernelVersion,
+		ContainerOsVersion: FakeContainerOSVersion,
+		DockerVersion:      fakeDockerVersion,
+	}, nil
+}
+
+// ImagesFsInfo is a fake implementation of Interface.ImagesFsInfo.
+func (c *Fake) ImagesFsInfo() (cadvisorapiv2.FsInfo, error) {
+	return cadvisorapiv2.FsInfo{}, nil
+}
+
+// RootFsInfo is a fake implementation of Interface.RootFsInfo.
+func (c *Fake) RootFsInfo() (cadvisorapiv2.FsInfo, error) {
+	return cadvisorapiv2.FsInfo{}, nil
+}
+
+// WatchEvents is a fake implementation of Interface.WatchEvents.
+func (c *Fake) WatchEvents(request *events.Request) (*events.EventChannel, error) {
+	return new(events.EventChannel), nil
+}
+
+// GetDirFsInfo is a fake implementation of Interface.GetDirFsInfo.
+func (c *Fake) GetDirFsInfo(path string) (cadvisorapiv2.FsInfo, error) {
+	return cadvisorapiv2.FsInfo{}, nil
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/testing/cadvisor_mock.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/testing/cadvisor_mock.go
new file mode 100644
index 000000000..0112db5ca
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/testing/cadvisor_mock.go
@@ -0,0 +1,104 @@
+/*
+Copyright 2015 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 (
+	"github.com/google/cadvisor/events"
+	cadvisorapi "github.com/google/cadvisor/info/v1"
+	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
+	"github.com/stretchr/testify/mock"
+	"k8s.io/kubernetes/pkg/kubelet/cadvisor"
+)
+
+// Mock cadvisor.Interface implementation.
+type Mock struct {
+	mock.Mock
+}
+
+var _ cadvisor.Interface = new(Mock)
+
+// Start is a mock implementation of Interface.Start.
+func (c *Mock) Start() error {
+	args := c.Called()
+	return args.Error(0)
+}
+
+// ContainerInfo is a mock implementation of Interface.ContainerInfo.
+func (c *Mock) ContainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (*cadvisorapi.ContainerInfo, error) {
+	args := c.Called(name, req)
+	return args.Get(0).(*cadvisorapi.ContainerInfo), args.Error(1)
+}
+
+// ContainerInfoV2 is a mock implementation of Interface.ContainerInfoV2.
+func (c *Mock) ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions) (map[string]cadvisorapiv2.ContainerInfo, error) {
+	args := c.Called(name, options)
+	return args.Get(0).(map[string]cadvisorapiv2.ContainerInfo), args.Error(1)
+}
+
+// GetRequestedContainersInfo is a fake implementation if Interface.GetRequestedContainersInfo
+func (c *Mock) GetRequestedContainersInfo(containerName string, options cadvisorapiv2.RequestOptions) (map[string]*cadvisorapi.ContainerInfo, error) {
+	args := c.Called(containerName, options)
+	return args.Get(0).(map[string]*cadvisorapi.ContainerInfo), args.Error(1)
+}
+
+// SubcontainerInfo is a mock implementation of Interface.SubcontainerInfo.
+func (c *Mock) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) {
+	args := c.Called(name, req)
+	return args.Get(0).(map[string]*cadvisorapi.ContainerInfo), args.Error(1)
+}
+
+// DockerContainer is a mock implementation of Interface.DockerContainer.
+func (c *Mock) DockerContainer(name string, req *cadvisorapi.ContainerInfoRequest) (cadvisorapi.ContainerInfo, error) {
+	args := c.Called(name, req)
+	return args.Get(0).(cadvisorapi.ContainerInfo), args.Error(1)
+}
+
+// MachineInfo is a mock implementation of Interface.MachineInfo.
+func (c *Mock) MachineInfo() (*cadvisorapi.MachineInfo, error) {
+	args := c.Called()
+	return args.Get(0).(*cadvisorapi.MachineInfo), args.Error(1)
+}
+
+// VersionInfo is a mock implementation of Interface.VersionInfo.
+func (c *Mock) VersionInfo() (*cadvisorapi.VersionInfo, error) {
+	args := c.Called()
+	return args.Get(0).(*cadvisorapi.VersionInfo), args.Error(1)
+}
+
+// ImagesFsInfo is a mock implementation of Interface.ImagesFsInfo.
+func (c *Mock) ImagesFsInfo() (cadvisorapiv2.FsInfo, error) {
+	args := c.Called()
+	return args.Get(0).(cadvisorapiv2.FsInfo), args.Error(1)
+}
+
+// RootFsInfo is a mock implementation of Interface.RootFsInfo.
+func (c *Mock) RootFsInfo() (cadvisorapiv2.FsInfo, error) {
+	args := c.Called()
+	return args.Get(0).(cadvisorapiv2.FsInfo), args.Error(1)
+}
+
+// WatchEvents is a mock implementation of Interface.WatchEvents.
+func (c *Mock) WatchEvents(request *events.Request) (*events.EventChannel, error) {
+	args := c.Called()
+	return args.Get(0).(*events.EventChannel), args.Error(1)
+}
+
+// GetDirFsInfo is a mock implementation of Interface.GetDirFsInfo.
+func (c *Mock) GetDirFsInfo(path string) (cadvisorapiv2.FsInfo, error) {
+	args := c.Called(path)
+	return args.Get(0).(cadvisorapiv2.FsInfo), args.Error(1)
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 0de5527aa..c197d3f22 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1851,6 +1851,7 @@ k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1
 k8s.io/kubernetes/pkg/kubelet/apis/config/validation
 k8s.io/kubernetes/pkg/kubelet/apis/podresources
 k8s.io/kubernetes/pkg/kubelet/cadvisor
+k8s.io/kubernetes/pkg/kubelet/cadvisor/testing
 k8s.io/kubernetes/pkg/kubelet/checkpointmanager
 k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum
 k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors