Merge pull request #450 from Danil-Grigorev/fix-agent-command

furkatgofurov7 · web-flow · commit 807aae7d1d8d · 2024-10-08T14:14:37.000+03:00
🐛 Prevent machine re-rollout on system agent start command
diff --git a/pkg/rke2/machine_filters.go b/pkg/rke2/machine_filters.go
@@ -76,7 +76,7 @@ func matchesRKE2BootstrapConfig(machineConfigs map[string]*bootstrapv1.RKE2Confi
 			cmds := []string{}
 
 			for _, cmd := range machineConfig.Spec.PostRKE2Commands { // Filter out commands that are injected by the Rancher Turtles webhook
-				if cmd == "sudo sh /opt/system-agent-install.sh" {
+				if cmd == "sh /opt/system-agent-install.sh" {
 					continue
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func matchesRKE2BootstrapConfig(machineConfigs map[string]*bootstrapv1.RKE2Confi`
`76`	`76`	`cmds := []string{}`
`77`	`77`
`78`	`78`	`for _, cmd := range machineConfig.Spec.PostRKE2Commands { // Filter out commands that are injected by the Rancher Turtles webhook`
`79`		`- if cmd == "sudo sh /opt/system-agent-install.sh" {`
	`79`	`+ if cmd == "sh /opt/system-agent-install.sh" {`
`80`	`80`	`continue`
`81`	`81`	`}`
`82`	`82`