From c174625116a1fcb36443710b900f7ea2114cd49c Mon Sep 17 00:00:00 2001 From: Aleksandra Malinowska Date: Mon, 17 Jul 2017 17:54:58 +0200 Subject: [PATCH] add InstanceID to fake cadvisor (used in Kubemark) --- cmd/kubemark/hollow-node.go | 4 +++- pkg/kubelet/cadvisor/testing/cadvisor_fake.go | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index 54cdbba137..5b69f2bb54 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -112,7 +112,9 @@ func main() { } if config.Morph == "kubelet" { - cadvisorInterface := new(cadvisortest.Fake) + cadvisorInterface := &cadvisortest.Fake{ + NodeName: config.NodeName, + } containerManager := cm.NewStubContainerManager() fakeDockerClient := libdocker.NewFakeDockerClient().WithTraceDisabled() fakeDockerClient.EnableSleep = true diff --git a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go index 6456671250..c9d0f2ebb5 100644 --- a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go +++ b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go @@ -25,6 +25,7 @@ import ( // Fake cAdvisor implementation. type Fake struct { + NodeName string } var _ cadvisor.Interface = new(Fake) @@ -54,6 +55,7 @@ func (c *Fake) MachineInfo() (*cadvisorapi.MachineInfo, error) { // We set it to non-zero values to make non-zero-capacity machines in Kubemark. return &cadvisorapi.MachineInfo{ NumCores: 1, + InstanceID: cadvisorapi.InstanceID(c.NodeName), MemoryCapacity: 4026531840, }, nil }