Use control-plane in node selector instead of deprecated master

ardaguclu · ardaguclu · commit 027f4a813984 · 2025-05-28T09:54:30.000+03:00
diff --git a/pkg/cli/admin/mustgather/mustgather.go b/pkg/cli/admin/mustgather/mustgather.go
@@ -467,7 +467,7 @@ func (o *MustGatherOptions) Run() error {
 	}
 	var hasMaster bool
 	for _, node := range nodes.Items {
-		if _, ok := node.Labels["node-role.kubernetes.io/master"]; ok {
+		if _, ok := node.Labels["node-role.kubernetes.io/control-plane"]; ok {
 			hasMaster = true
 			break
 		}
@@ -929,7 +929,7 @@ func (o *MustGatherOptions) newPod(node, image string, hasMaster bool) *corev1.P
 		corev1.LabelOSStable: "linux",
 	}
 	if node == "" && hasMaster {
-		nodeSelector["node-role.kubernetes.io/master"] = ""
+		nodeSelector["node-role.kubernetes.io/control-plane"] = ""
 	}
 
 	executedCommand := "/usr/bin/gather"

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ func (o *MustGatherOptions) Run() error {`
`467`	`467`	`}`
`468`	`468`	`var hasMaster bool`
`469`	`469`	`for _, node := range nodes.Items {`
`470`		`- if _, ok := node.Labels["node-role.kubernetes.io/master"]; ok {`
	`470`	`+ if _, ok := node.Labels["node-role.kubernetes.io/control-plane"]; ok {`
`471`	`471`	`hasMaster = true`
`472`	`472`	`break`
`473`	`473`	`}`
`@@ -929,7 +929,7 @@ func (o MustGatherOptions) newPod(node, image string, hasMaster bool) corev1.P`
`929`	`929`	`corev1.LabelOSStable: "linux",`
`930`	`930`	`}`
`931`	`931`	`if node == "" && hasMaster {`
`932`		`- nodeSelector["node-role.kubernetes.io/master"] = ""`
	`932`	`+ nodeSelector["node-role.kubernetes.io/control-plane"] = ""`
`933`	`933`	`}`
`934`	`934`
`935`	`935`	`executedCommand := "/usr/bin/gather"`