Merge pull request #29388 from kinarashah/25rc

[release/v2.5] set default value for ignoreDaemonSets
rancher · Oct 6, 2020 · 65f3525 · 65f3525
2 parents 72d1332 + a9ae128
commit 65f3525
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pkg/controllers/managementuser/nodesyncer/cordonfieldssyncer.go b/pkg/controllers/managementuser/nodesyncer/cordonfieldssyncer.go
@@ -236,11 +236,17 @@ func (d *nodeDrain) getKubeConfig() (*clientcmdapi.Config, error) {
 }
 
 func getFlags(input *v32.NodeDrainInput) []string {
+	var ignoreDaemonSets bool
+	if input.IgnoreDaemonSets == nil {
+		ignoreDaemonSets = true
+	} else {
+		ignoreDaemonSets = *input.IgnoreDaemonSets
+	}
 	return []string{
 		fmt.Sprintf("--delete-local-data=%v", input.DeleteLocalData),
 		fmt.Sprintf("--force=%v", input.Force),
 		fmt.Sprintf("--grace-period=%v", input.GracePeriod),
-		fmt.Sprintf("--ignore-daemonsets=%v", *input.IgnoreDaemonSets),
+		fmt.Sprintf("--ignore-daemonsets=%v", ignoreDaemonSets),
 		fmt.Sprintf("--timeout=%s", convert.ToString(input.Timeout)+"s")}
 }