Fix k0s controller args in autopilot inttests

The controller args were erroneously passed to the asserting function, not to the test suite's controller init function. Signed-off-by: Tom Wieczorek <[email protected]>
twz123 · Nov 22, 2023 · 984b97b · 984b97b
1 parent 1660081
commit 984b97b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/inttest/ap-platformselect/platformselect_test.go b/inttest/ap-platformselect/platformselect_test.go
@@ -38,7 +38,7 @@ func (s *platformSelectSuite) SetupTest() {
 	ctx := s.Context()
 	s.Require().NoError(s.WaitForSSH(s.ControllerNode(0), 2*time.Minute, 1*time.Second))
 
-	s.Require().NoError(s.InitController(0), "--disable-components=metrics-server")
+	s.Require().NoError(s.InitController(0, "--disable-components=metrics-server"))
 	s.Require().NoError(s.WaitJoinAPI(s.ControllerNode(0)))
 
 	client, err := s.ExtensionsClient(s.ControllerNode(0))

diff --git a/inttest/ap-single/single_test.go b/inttest/ap-single/single_test.go
@@ -49,7 +49,7 @@ func (s *plansSingleControllerSuite) SetupTest() {
 	_, err = ssh.ExecWithOutput(ctx, "cp /dist/k0s /tmp/k0s")
 	s.Require().NoError(err)
 
-	s.Require().NoError(s.InitController(0), "--disable-components=metrics-server")
+	s.Require().NoError(s.InitController(0, "--disable-components=metrics-server"))
 	s.Require().NoError(s.WaitJoinAPI(s.ControllerNode(0)))
 
 	client, err := s.ExtensionsClient(s.ControllerNode(0))

diff --git a/inttest/ap-updater-periodic/updater_test.go b/inttest/ap-updater-periodic/updater_test.go
@@ -59,7 +59,7 @@ func (s *plansSingleControllerSuite) SetupTest() {
 	}
 	s.PutFileTemplate(s.ControllerNode(0), "/etc/conf.d/k0scontroller", envTemplate, vars)
 
-	s.Require().NoError(s.InitController(0), "--disable-components=metrics-server")
+	s.Require().NoError(s.InitController(0, "--disable-components=metrics-server"))
 	s.Require().NoError(s.WaitJoinAPI(s.ControllerNode(0)))
 
 	kc, err := s.KubeClient(s.ControllerNode(0))

diff --git a/inttest/ap-updater/updater_test.go b/inttest/ap-updater/updater_test.go
@@ -42,7 +42,7 @@ func (s *plansSingleControllerSuite) SetupTest() {
 	ctx := s.Context()
 	s.Require().NoError(s.WaitForSSH(s.ControllerNode(0), 2*time.Minute, 1*time.Second))
 
-	s.Require().NoError(s.InitController(0), "--disable-components=metrics-server")
+	s.Require().NoError(s.InitController(0, "--disable-components=metrics-server"))
 	s.Require().NoError(s.WaitJoinAPI(s.ControllerNode(0)))
 
 	client, err := s.ExtensionsClient(s.ControllerNode(0))