github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

add InstanceID to fake cadvisor (used in Kubemark)

Browse Source
This commit is contained in:
Aleksandra Malinowska 2017-07-17 17:54:58 +02:00
parent 54b68a2a3f
commit c174625116
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubemark/hollow-node.go
View File

@ -112,7 +112,9 @@ func main() {
} }
if config.Morph == "kubelet" { if config.Morph == "kubelet" {
cadvisorInterface := new(cadvisortest.Fake) cadvisorInterface := &cadvisortest.Fake{
NodeName: config.NodeName,
}
containerManager := cm.NewStubContainerManager() containerManager := cm.NewStubContainerManager()
fakeDockerClient := libdocker.NewFakeDockerClient().WithTraceDisabled() fakeDockerClient := libdocker.NewFakeDockerClient().WithTraceDisabled()
fakeDockerClient.EnableSleep = true fakeDockerClient.EnableSleep = true

2
pkg/kubelet/cadvisor/testing/cadvisor_fake.go
View File

@ -25,6 +25,7 @@ import (
// Fake cAdvisor implementation. // Fake cAdvisor implementation.
type Fake struct { type Fake struct {
NodeName string
} }
var _ cadvisor.Interface = new(Fake) 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. // We set it to non-zero values to make non-zero-capacity machines in Kubemark.
return &cadvisorapi.MachineInfo{ return &cadvisorapi.MachineInfo{
NumCores: 1, NumCores: 1,
InstanceID: cadvisorapi.InstanceID(c.NodeName),
MemoryCapacity: 4026531840, MemoryCapacity: 4026531840,
}, nil }, nil
} }