rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-01 23:16:22 +00:00
Code Issues Releases Wiki Activity

Updated api bool fields with default=true to *bool. Go files

Browse Source
This commit is contained in:
rawmind0
2020-05-20 20:30:46 +02:00
parent 43627bcf20
commit 8ff29b617f
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/cluster.go
View File

@@ -628,7 +628,7 @@ func parseNodeDrainInput(clusterFile string, rkeConfig *v3.RancherKubernetesEngi
var update bool var update bool
if _, ok := nodeDrainInputMap["ignore_daemonsets"]; !ok { if _, ok := nodeDrainInputMap["ignore_daemonsets"]; !ok {
// user hasn't provided any input, default to true // user hasn't provided any input, default to true
nodeDrainInput.IgnoreDaemonSets = DefaultNodeDrainIgnoreDaemonsets nodeDrainInput.IgnoreDaemonSets = &DefaultNodeDrainIgnoreDaemonsets
update = true update = true
} }
if _, ok := nodeDrainInputMap["timeout"]; !ok { if _, ok := nodeDrainInputMap["timeout"]; !ok {

4
cluster/defaults.go
View File

@@ -89,10 +89,10 @@ const (
DefaultMaxUnavailableControlplane = "1" DefaultMaxUnavailableControlplane = "1"
DefaultNodeDrainTimeout = 120 DefaultNodeDrainTimeout = 120
DefaultNodeDrainGracePeriod = -1 DefaultNodeDrainGracePeriod = -1
DefaultNodeDrainIgnoreDaemonsets = true
) )
var ( var (
DefaultNodeDrainIgnoreDaemonsets = true
DefaultDaemonSetMaxUnavailable = intstr.FromInt(1) DefaultDaemonSetMaxUnavailable = intstr.FromInt(1)
DefaultDeploymentUpdateStrategyParams = intstr.FromString("25%") DefaultDeploymentUpdateStrategyParams = intstr.FromString("25%")
DefaultDaemonSetUpdateStrategy = v3.DaemonSetUpdateStrategy{ DefaultDaemonSetUpdateStrategy = v3.DaemonSetUpdateStrategy{
@@ -242,7 +242,7 @@ func (c *Cluster) setNodeUpgradeStrategy() {
} }
if c.UpgradeStrategy.DrainInput == nil { if c.UpgradeStrategy.DrainInput == nil {
c.UpgradeStrategy.DrainInput = &v3.NodeDrainInput{ c.UpgradeStrategy.DrainInput = &v3.NodeDrainInput{
IgnoreDaemonSets: DefaultNodeDrainIgnoreDaemonsets, IgnoreDaemonSets: &DefaultNodeDrainIgnoreDaemonsets,
// default to 120 seems to work better for controlplane nodes // default to 120 seems to work better for controlplane nodes
Timeout: DefaultNodeDrainTimeout, Timeout: DefaultNodeDrainTimeout,
//Period of time in seconds given to each pod to terminate gracefully. //Period of time in seconds given to each pod to terminate gracefully.

2
cluster/hosts.go
View File

@@ -81,7 +81,7 @@ func (c *Cluster) InvertIndexHosts() error {
for k, v := range host.Labels { for k, v := range host.Labels {
newHost.ToAddLabels[k] = v newHost.ToAddLabels[k] = v
} }
newHost.IgnoreDockerVersion = c.IgnoreDockerVersion newHost.IgnoreDockerVersion = *c.IgnoreDockerVersion
if c.BastionHost.Address != "" { if c.BastionHost.Address != "" {
// Add the bastion host information to each host object // Add the bastion host information to each host object
newHost.BastionHost = c.BastionHost newHost.BastionHost = c.BastionHost

5
cmd/common.go
View File

@@ -54,9 +54,8 @@ func setOptionsFromCLI(c *cli.Context, rkeConfig *v3.RancherKubernetesEngineConf
rkeConfig.SSHAgentAuth = c.Bool("ssh-agent-auth") rkeConfig.SSHAgentAuth = c.Bool("ssh-agent-auth")
} }
if c.Bool("ignore-docker-version") { ignoreDockerVersion := c.Bool("ignore-docker-version")
rkeConfig.IgnoreDockerVersion = c.Bool("ignore-docker-version") rkeConfig.IgnoreDockerVersion = &ignoreDockerVersion
}
if c.Bool("s3") { if c.Bool("s3") {
if rkeConfig.Services.Etcd.BackupConfig == nil { if rkeConfig.Services.Etcd.BackupConfig == nil {

3
cmd/up.go
View File

@@ -317,7 +317,8 @@ func clusterUpLocal(ctx *cli.Context) error {
rkeConfig.Nodes = []v3.RKEConfigNode{*cluster.GetLocalRKENodeConfig()} 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 // setting up the dialers
dialers := hosts.GetDialerOptions(nil, hosts.LocalHealthcheckFactory, nil) dialers := hosts.GetDialerOptions(nil, hosts.LocalHealthcheckFactory, nil)

2
services/node_util.go
View File

@@ -52,7 +52,7 @@ func getDrainHelper(kubeClient *kubernetes.Clientset, upgradeStrategy v3.NodeUpg
drainHelper := drain.Helper{ drainHelper := drain.Helper{
Client: kubeClient, Client: kubeClient,
Force: upgradeStrategy.DrainInput.Force, Force: upgradeStrategy.DrainInput.Force,
IgnoreAllDaemonSets: upgradeStrategy.DrainInput.IgnoreDaemonSets, IgnoreAllDaemonSets: *upgradeStrategy.DrainInput.IgnoreDaemonSets,
DeleteLocalData: upgradeStrategy.DrainInput.DeleteLocalData, DeleteLocalData: upgradeStrategy.DrainInput.DeleteLocalData,
GracePeriodSeconds: upgradeStrategy.DrainInput.GracePeriod, GracePeriodSeconds: upgradeStrategy.DrainInput.GracePeriod,
Timeout: time.Second * time.Duration(upgradeStrategy.DrainInput.Timeout), Timeout: time.Second * time.Duration(upgradeStrategy.DrainInput.Timeout),