Make number of nodes per k8s cluster configurable, drop nodes to 1 pe…

…r cluster for registration test.
k8ssandra · May 10, 2024 · 8d494c3 · 8d494c3
1 parent 10d540d
commit 8d494c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmd/kubectl-k8ssandra/register/suite_test.go b/cmd/kubectl-k8ssandra/register/suite_test.go
@@ -14,5 +14,5 @@ var (
 func TestMain(m *testing.M) {
 	os.Exit(envtest.RunMultiKind(m, func(e *envtest.MultiK8sEnvironment) {
 		multiEnv = e
-	}, 2))
+	}, []int{1, 1}))
 }
diff --git a/internal/envtest/multi_envtest.go b/internal/envtest/multi_envtest.go
@@ -28,15 +28,15 @@ func RunMulti(m *testing.M, setupFunc func(e *MultiK8sEnvironment), numClusters
 	return exitCode
 }
 
-func RunMultiKind(m *testing.M, setupFunc func(e *MultiK8sEnvironment), numClusters int) (code int) {
-	e := make(MultiK8sEnvironment, numClusters)
+func RunMultiKind(m *testing.M, setupFunc func(e *MultiK8sEnvironment), topology []int) (code int) {
+	e := make(MultiK8sEnvironment, len(topology))
 	ctx := ctrl.SetupSignalHandler()
 	var wg sync.WaitGroup
-	for i := 0; i < numClusters; i++ {
+	for i := 0; i < len(topology); i++ {
 		cluster := KindManager{
 			ClusterName:        "cluster" + strconv.Itoa(i),
 			KubeconfigLocation: os.NewFile(0, GetBuildDir()+"/cluster"+strconv.Itoa(i)),
-			Nodes:              3,
+			Nodes:              topology[i],
 		}
 		wg.Add(1)
 		go func(i int) {
@@ -47,7 +47,7 @@ func RunMultiKind(m *testing.M, setupFunc func(e *MultiK8sEnvironment), numClust
 	}
 	wg.Wait()
 	defer func() {
-		for i := 0; i < numClusters; i++ {
+		for i := 0; i < len(topology); i++ {
 			wg.Add(1)
 			go func(i int) {
 				defer wg.Done()