From 8ff29b617f85498d00e49f545f48fbdde04f8b8d Mon Sep 17 00:00:00 2001
From: rawmind0 <rawmind@gmail.com>
Date: Wed, 20 May 2020 20:30:46 +0200
Subject: [PATCH] Updated api bool fields with default=true to *bool. Go files

---
 cluster/cluster.go    | 2 +-
 cluster/defaults.go   | 4 ++--
 cluster/hosts.go      | 2 +-
 cmd/common.go         | 5 ++---
 cmd/up.go             | 3 ++-
 services/node_util.go | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cluster/cluster.go b/cluster/cluster.go
index 9683b179..f6c7d4aa 100644
--- a/cluster/cluster.go
+++ b/cluster/cluster.go
@@ -628,7 +628,7 @@ func parseNodeDrainInput(clusterFile string, rkeConfig *v3.RancherKubernetesEngi
 	var update bool
 	if _, ok := nodeDrainInputMap["ignore_daemonsets"]; !ok {
 		// user hasn't provided any input, default to true
-		nodeDrainInput.IgnoreDaemonSets = DefaultNodeDrainIgnoreDaemonsets
+		nodeDrainInput.IgnoreDaemonSets = &DefaultNodeDrainIgnoreDaemonsets
 		update = true
 	}
 	if _, ok := nodeDrainInputMap["timeout"]; !ok {
diff --git a/cluster/defaults.go b/cluster/defaults.go
index 9a32f991..4b394600 100644
--- a/cluster/defaults.go
+++ b/cluster/defaults.go
@@ -89,10 +89,10 @@ const (
 	DefaultMaxUnavailableControlplane = "1"
 	DefaultNodeDrainTimeout           = 120
 	DefaultNodeDrainGracePeriod       = -1
-	DefaultNodeDrainIgnoreDaemonsets  = true
 )
 
 var (
+	DefaultNodeDrainIgnoreDaemonsets      = true
 	DefaultDaemonSetMaxUnavailable        = intstr.FromInt(1)
 	DefaultDeploymentUpdateStrategyParams = intstr.FromString("25%")
 	DefaultDaemonSetUpdateStrategy        = v3.DaemonSetUpdateStrategy{
@@ -242,7 +242,7 @@ func (c *Cluster) setNodeUpgradeStrategy() {
 	}
 	if c.UpgradeStrategy.DrainInput == nil {
 		c.UpgradeStrategy.DrainInput = &v3.NodeDrainInput{
-			IgnoreDaemonSets: DefaultNodeDrainIgnoreDaemonsets,
+			IgnoreDaemonSets: &DefaultNodeDrainIgnoreDaemonsets,
 			// default to 120 seems to work better for controlplane nodes
 			Timeout: DefaultNodeDrainTimeout,
 			//Period of time in seconds given to each pod to terminate gracefully.
diff --git a/cluster/hosts.go b/cluster/hosts.go
index 906c8f61..6a59c716 100644
--- a/cluster/hosts.go
+++ b/cluster/hosts.go
@@ -81,7 +81,7 @@ func (c *Cluster) InvertIndexHosts() error {
 		for k, v := range host.Labels {
 			newHost.ToAddLabels[k] = v
 		}
-		newHost.IgnoreDockerVersion = c.IgnoreDockerVersion
+		newHost.IgnoreDockerVersion = *c.IgnoreDockerVersion
 		if c.BastionHost.Address != "" {
 			// Add the bastion host information to each host object
 			newHost.BastionHost = c.BastionHost
diff --git a/cmd/common.go b/cmd/common.go
index 6711ad7b..dc7ca8bf 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -54,9 +54,8 @@ func setOptionsFromCLI(c *cli.Context, rkeConfig *v3.RancherKubernetesEngineConf
 		rkeConfig.SSHAgentAuth = c.Bool("ssh-agent-auth")
 	}
 
-	if c.Bool("ignore-docker-version") {
-		rkeConfig.IgnoreDockerVersion = c.Bool("ignore-docker-version")
-	}
+	ignoreDockerVersion := c.Bool("ignore-docker-version")
+	rkeConfig.IgnoreDockerVersion = &ignoreDockerVersion
 
 	if c.Bool("s3") {
 		if rkeConfig.Services.Etcd.BackupConfig == nil {
diff --git a/cmd/up.go b/cmd/up.go
index 328fdfe3..a388b87f 100644
--- a/cmd/up.go
+++ b/cmd/up.go
@@ -317,7 +317,8 @@ func clusterUpLocal(ctx *cli.Context) error {
 		rkeConfig.Nodes = []v3.RKEConfigNode{*cluster.GetLocalRKENodeConfig()}
 	}
 
-	rkeConfig.IgnoreDockerVersion = ctx.Bool("ignore-docker-version")
+	ignoreDockerVersion := ctx.Bool("ignore-docker-version")
+	rkeConfig.IgnoreDockerVersion = &ignoreDockerVersion
 
 	// setting up the dialers
 	dialers := hosts.GetDialerOptions(nil, hosts.LocalHealthcheckFactory, nil)
diff --git a/services/node_util.go b/services/node_util.go
index 8b5c459e..e1611f52 100644
--- a/services/node_util.go
+++ b/services/node_util.go
@@ -52,7 +52,7 @@ func getDrainHelper(kubeClient *kubernetes.Clientset, upgradeStrategy v3.NodeUpg
 	drainHelper := drain.Helper{
 		Client:              kubeClient,
 		Force:               upgradeStrategy.DrainInput.Force,
-		IgnoreAllDaemonSets: upgradeStrategy.DrainInput.IgnoreDaemonSets,
+		IgnoreAllDaemonSets: *upgradeStrategy.DrainInput.IgnoreDaemonSets,
 		DeleteLocalData:     upgradeStrategy.DrainInput.DeleteLocalData,
 		GracePeriodSeconds:  upgradeStrategy.DrainInput.GracePeriod,
 		Timeout:             time.Second * time.Duration(upgradeStrategy.DrainInput.Timeout),