Merge pull request kubernetes#93201 from ellistarn/kubemark

k8s-ci-robot · web-flow · commit 8d30a5f1364a · 2020-09-17T22:24:45.000-07:00
Filters on kubemark nodegroups when selecting node template to enable hollow node clusters that contain real nodes.
diff --git a/pkg/kubemark/controller.go b/pkg/kubemark/controller.go
@@ -351,7 +351,8 @@ func (kubemarkController *KubemarkController) runNodeCreation(stop <-chan struct
 }
 
 func (kubemarkCluster *kubemarkCluster) getHollowNodeName() (string, error) {
-	nodes, err := kubemarkCluster.nodeLister.List(labels.Everything())
+	selector, _ := labels.Parse(nodeGroupLabel)
+	nodes, err := kubemarkCluster.nodeLister.List(selector)
 	if err != nil {
 		return "", err
 	}

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,8 @@ func (kubemarkController *KubemarkController) runNodeCreation(stop <-chan struct`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`func (kubemarkCluster *kubemarkCluster) getHollowNodeName() (string, error) {`
`354`		`- nodes, err := kubemarkCluster.nodeLister.List(labels.Everything())`
	`354`	`+ selector, _ := labels.Parse(nodeGroupLabel)`
	`355`	`+ nodes, err := kubemarkCluster.nodeLister.List(selector)`
`355`	`356`	`if err != nil {`
`356`	`357`	`return "", err`
`357`	`358`	`}`