Merge pull request #49102 from aleksandra-malinowska/kubemark-node-provider-id

Automatic merge from submit-queue (batch tested with PRs 46094, 48544, 48807, 49102, 44174) add InstanceID to fake cadvisor (used in Kubemark) This change is for setting Node.Spec.ProviderID field in Kubemark hollow nodes. It shouldn't affect other tests using cadvisor.Fake as field is nil by default. cc @gmarek

Merge pull request #49102 from aleksandra-malinowska/kubemark-node-provider-id
bc2e5381 · Kubernetes Submit Queue · GitHub · 89a1ce2c · c1746251 · bc2e5381
Commit bc2e5381 authored Jul 18, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

hollow-node.go cmd/kubemark/hollow-node.go +3 -1

cadvisor_fake.go pkg/kubelet/cadvisor/testing/cadvisor_fake.go +2 -0

No files found.
--- 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

--- 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
 }