inttest: use variadic args for GetJoinToken

Signed-off-by: Natanael Copa <[email protected]>
k0sproject · Mar 29, 2021 · 6310751 · 6310751
1 parent be522d5
commit 6310751
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/inttest/byocri/byocri_test.go b/inttest/byocri/byocri_test.go
@@ -57,7 +57,7 @@ func (s *BYOCRISuite) TestK0sGetsUp() {
 }
 
 func (s *BYOCRISuite) runDockerWorker() error {
-	token, err := s.GetJoinToken("worker", "")
+	token, err := s.GetJoinToken("worker")
 	if err != nil {
 		return err
 	}

diff --git a/inttest/common/footloosesuite.go b/inttest/common/footloosesuite.go
@@ -211,10 +211,6 @@ func getDataDirOpt(args []string) string {
 	return ""
 }
 
-func getDataDir(args []string) string {
-	return strings.TrimPrefix(getDataDirOpt(args), "--data-dir=")
-}
-
 // InitController initializes a controller
 func (s *FootlooseSuite) InitController(idx int, k0sArgs ...string) error {
 	controllerNode := s.ControllerNode(idx)
@@ -235,7 +231,7 @@ func (s *FootlooseSuite) InitController(idx int, k0sArgs ...string) error {
 }
 
 // GetJoinToken generates join token for the asked role
-func (s *FootlooseSuite) GetJoinToken(role string, dataDir string) (string, error) {
+func (s *FootlooseSuite) GetJoinToken(role string, extraArgs ...string) (string, error) {
 	// assume we have main on node 0 always
 	controllerNode := s.ControllerNode(0)
 	s.Contains([]string{"controller", "worker"}, role, "Bad role")
@@ -244,7 +240,7 @@ func (s *FootlooseSuite) GetJoinToken(role string, dataDir string) (string, erro
 		return "", err
 	}
 	defer ssh.Disconnect()
-	token, err := ssh.ExecWithOutput(fmt.Sprintf("k0s token create --role=%s --data-dir=%s", role, dataDir))
+	token, err := ssh.ExecWithOutput(fmt.Sprintf("k0s token create --role=%s %s", role, strings.Join(extraArgs, " ")))
 	if err != nil {
 		return "", fmt.Errorf("can't get join token: %v", err)
 	}
@@ -262,7 +258,7 @@ func (s *FootlooseSuite) RunWorkers(args ...string) error {
 		return err
 	}
 	defer ssh.Disconnect()
-	token, err := s.GetJoinToken("worker", getDataDir(args))
+	token, err := s.GetJoinToken("worker", getDataDirOpt(args))
 	if err != nil {
 		return err
 	}

diff --git a/inttest/hacontrolplane/hacontrolplane_test.go b/inttest/hacontrolplane/hacontrolplane_test.go
@@ -65,7 +65,7 @@ func (s *HAControlplaneSuite) makeNodeLeave(executeOnControllerIdx int, peerAddr
 
 func (s *HAControlplaneSuite) TestDeregistration() {
 	s.NoError(s.InitController(0))
-	token, err := s.GetJoinToken("controller", "")
+	token, err := s.GetJoinToken("controller")
 	s.NoError(err)
 	s.NoError(s.InitController(1, token))
 

diff --git a/inttest/multicontroller/multicontroller_test.go b/inttest/multicontroller/multicontroller_test.go
@@ -47,7 +47,7 @@ func (s *MultiControllerSuite) TestK0sGetsUp() {
 	s.PutFile(s.ControllerNode(0), "/tmp/k0s.yaml", fmt.Sprintf(k0sConfigWithMultiController, ipAddress))
 	s.NoError(s.InitController(0, "--config=/tmp/k0s.yaml"))
 
-	token, err := s.GetJoinToken("controller", "")
+	token, err := s.GetJoinToken("controller")
 	s.NoError(err)
 	s.PutFile(s.ControllerNode(1), "/tmp/k0s.yaml", fmt.Sprintf(k0sConfigWithMultiController, ipAddress))
 	s.NoError(s.InitController(1, "--config=/tmp/k0s.yaml", token))