Merge pull request #50440 from bskiba/kubemark_e2e_open

Automatic merge from submit-queue (batch tested with PRs 45186, 50440) Add functionality needed by Cluster Autoscaler to Kubemark Provider. Make adding nodes asynchronous. Add method for getting target size of node group. Add method for getting node group for node. Factor out some common code. **Release note**: ``` NONE ```

Merge pull request #50440 from bskiba/kubemark_e2e_open
eb700d86 · Kubernetes Submit Queue · GitHub · 548469fe · 20a37560 · eb700d86
Commit eb700d86 authored Aug 10, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 10, 2017
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

controller.go pkg/kubemark/controller.go +0 -0

framework.go test/e2e/framework/framework.go +2 -1

size.go test/e2e/framework/size.go +1 -1

No files found.
--- a/pkg/kubemark/controller.go
+++ b/pkg/kubemark/controller.go
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -215,7 +215,8 @@ func (f *Framework) BeforeEach() {
 			TestContext.CloudConfig.KubemarkController, err = kubemark.NewKubemarkController(f.KubemarkExternalClusterClientSet, externalInformerFactory, f.ClientSet, kubemarkNodeInformer)
 			Expect(err).NotTo(HaveOccurred())
 			externalInformerFactory.Start(f.kubemarkControllerCloseChannel)
-			TestContext.CloudConfig.KubemarkController.Init(f.kubemarkControllerCloseChannel)
+			Expect(TestContext.CloudConfig.KubemarkController.WaitForCacheSync(f.kubemarkControllerCloseChannel)).To(BeTrue())
+			go TestContext.CloudConfig.KubemarkController.Run(f.kubemarkControllerCloseChannel)
 		}
 	}

--- a/test/e2e/framework/size.go
+++ b/test/e2e/framework/size.go
@@ -75,7 +75,7 @@ func GetGroupNodes(group string) ([]string, error) {
 		}
 		return lines, nil
 	} else if TestContext.Provider == "kubemark" {
-		return TestContext.CloudConfig.KubemarkController.GetNodeNamesForNodegroup(group)
+		return TestContext.CloudConfig.KubemarkController.GetNodeNamesForNodeGroup(group)
 	} else {
 		return nil, fmt.Errorf("provider does not support InstanceGroups")
 	}