Add check for force-delete label before ParseBool (#1057)

gagan16k · web-flow · commit 2f42aa8ca591 · 2025-12-03T17:26:59.000+05:30
diff --git a/pkg/util/provider/machinecontroller/machine_util.go b/pkg/util/provider/machinecontroller/machine_util.go
@@ -1575,9 +1575,11 @@ func (c *controller) drainNode(ctx context.Context, deleteMachineRequest *driver
 		ReadonlyFilesystem   v1.NodeConditionType = "ReadonlyFilesystem"
 	)
 
-	forceDeleteLabelPresent, err = strconv.ParseBool(machine.Labels["force-deletion"])
-	if err != nil {
-		klog.Warningf("%q label for machine %q has invalid value: %s", "force-deletion", machine.Name, err)
+	if labelValue, exists := machine.Labels["force-deletion"]; exists {
+		forceDeleteLabelPresent, err = strconv.ParseBool(labelValue)
+		if err != nil {
+			klog.Warningf("%q label for machine %q has invalid value %q: %s", "force-deletion", machine.Name, labelValue, err)
+		}
 	}
 
 	if nodeName == "" {

Original file line number	Diff line number	Diff line change
`@@ -1575,9 +1575,11 @@ func (c controller) drainNode(ctx context.Context, deleteMachineRequest driver`
`1575`	`1575`	`ReadonlyFilesystem v1.NodeConditionType = "ReadonlyFilesystem"`
`1576`	`1576`	`)`
`1577`	`1577`
`1578`		`- forceDeleteLabelPresent, err = strconv.ParseBool(machine.Labels["force-deletion"])`
`1579`		`- if err != nil {`
`1580`		`- klog.Warningf("%q label for machine %q has invalid value: %s", "force-deletion", machine.Name, err)`
	`1578`	`+ if labelValue, exists := machine.Labels["force-deletion"]; exists {`
	`1579`	`+ forceDeleteLabelPresent, err = strconv.ParseBool(labelValue)`
	`1580`	`+ if err != nil {`
	`1581`	`+ klog.Warningf("%q label for machine %q has invalid value %q: %s", "force-deletion", machine.Name, labelValue, err)`
	`1582`	`+ }`
`1581`	`1583`	`}`
`1582`	`1584`
`1583`	`1585`	`if nodeName == "" {`