Merge pull request #6643 from twz123/backup-inttest-restart-controllers

twz123 · web-flow · commit 9178a0968296 · 2025-11-19T15:48:11.000+01:00
Don't restart additional controllers using --enable-worker in backup inttest
diff --git a/inttest/backup/backup_test.go b/inttest/backup/backup_test.go
@@ -72,6 +72,7 @@ func (s *BackupSuite) TestK0sGetsUp() {
 		}
 	}
 
+	s.Require().NoError(s.WaitForNodeReady(s.ControllerNode(0), kc))
 	for i := range s.WorkerCount {
 		s.Require().NoError(s.WaitForNodeReady(s.WorkerNode(i), kc))
 	}
@@ -99,10 +100,11 @@ func (s *BackupSuite) TestK0sGetsUp() {
 		for i := range s.ControllerCount - 1 {
 			i := i + 1
 			s.PutFile(s.ControllerNode(i), "/etc/k0s/k0s.yaml", config)
-			s.Require().NoError(s.InitController(i, "--enable-worker", token))
+			s.Require().NoError(s.InitController(i, token))
 		}
 	}
 
+	s.Require().NoError(s.WaitForNodeReady(s.ControllerNode(0), kc))
 	for i := range s.WorkerCount {
 		s.Require().NoError(s.WaitForNodeReady(s.WorkerNode(i), kc))
 	}

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ func (s *BackupSuite) TestK0sGetsUp() {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
	`75`	`+ s.Require().NoError(s.WaitForNodeReady(s.ControllerNode(0), kc))`
`75`	`76`	`for i := range s.WorkerCount {`
`76`	`77`	`s.Require().NoError(s.WaitForNodeReady(s.WorkerNode(i), kc))`
`77`	`78`	`}`
`@@ -99,10 +100,11 @@ func (s *BackupSuite) TestK0sGetsUp() {`
`99`	`100`	`for i := range s.ControllerCount - 1 {`
`100`	`101`	`i := i + 1`
`101`	`102`	`s.PutFile(s.ControllerNode(i), "/etc/k0s/k0s.yaml", config)`
`102`		`- s.Require().NoError(s.InitController(i, "--enable-worker", token))`
	`103`	`+ s.Require().NoError(s.InitController(i, token))`
`103`	`104`	`}`
`104`	`105`	`}`
`105`	`106`
	`107`	`+ s.Require().NoError(s.WaitForNodeReady(s.ControllerNode(0), kc))`
`106`	`108`	`for i := range s.WorkerCount {`
`107`	`109`	`s.Require().NoError(s.WaitForNodeReady(s.WorkerNode(i), kc))`
`108`	`110`	`}`