rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-07-14 07:36:05 +00:00
Code Issues Releases Wiki Activity

DeleteLocalData is now DeleteEmptyDirData in k8s v1.20

Browse Source
This commit is contained in:
Darren Shepherd 2020-12-08 16:32:07 -07:00
parent 5824366b06
commit e70f5ca388
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/controlplane.go
View File

@ -70,7 +70,7 @@ func UpgradeControlPlaneNodes(ctx context.Context, kubeClient *kubernetes.Client
} }
if upgradeStrategy.Drain != nil && *upgradeStrategy.Drain { if upgradeStrategy.Drain != nil && *upgradeStrategy.Drain {
drainHelper = getDrainHelper(kubeClient, *upgradeStrategy) drainHelper = getDrainHelper(kubeClient, *upgradeStrategy)
log.Infof(ctx, "[%s] Parameters provided to drain command: %#v", ControlRole, fmt.Sprintf("Force: %v, IgnoreAllDaemonSets: %v, DeleteLocalData: %v, Timeout: %v, GracePeriodSeconds: %v", drainHelper.Force, drainHelper.IgnoreAllDaemonSets, drainHelper.DeleteLocalData, drainHelper.Timeout, drainHelper.GracePeriodSeconds)) log.Infof(ctx, "[%s] Parameters provided to drain command: %#v", ControlRole, fmt.Sprintf("Force: %v, IgnoreAllDaemonSets: %v, DeleteEmptyDirData: %v, Timeout: %v, GracePeriodSeconds: %v", drainHelper.Force, drainHelper.IgnoreAllDaemonSets, drainHelper.DeleteEmptyDirData, drainHelper.Timeout, drainHelper.GracePeriodSeconds))
} }
var inactiveHostErr error var inactiveHostErr error
if len(inactiveHosts) > 0 { if len(inactiveHosts) > 0 {

2
services/node_util.go
View File

@ -57,7 +57,7 @@ func getDrainHelper(kubeClient *kubernetes.Clientset, upgradeStrategy v3.NodeUpg
Client: kubeClient, Client: kubeClient,
Force: upgradeStrategy.DrainInput.Force, Force: upgradeStrategy.DrainInput.Force,
IgnoreAllDaemonSets: ignoreDaemonSets, IgnoreAllDaemonSets: ignoreDaemonSets,
DeleteLocalData: upgradeStrategy.DrainInput.DeleteLocalData, DeleteEmptyDirData: 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),
Out: bytes.NewBuffer([]byte{}), Out: bytes.NewBuffer([]byte{}),

2
services/workerplane.go
View File

@ -103,7 +103,7 @@ func processWorkerPlaneForUpgrade(ctx context.Context, kubeClient *kubernetes.Cl
hostsQueue := util.GetObjectQueue(allHosts) hostsQueue := util.GetObjectQueue(allHosts)
if upgradeStrategy.Drain != nil && *upgradeStrategy.Drain { if upgradeStrategy.Drain != nil && *upgradeStrategy.Drain {
drainHelper = getDrainHelper(kubeClient, *upgradeStrategy) drainHelper = getDrainHelper(kubeClient, *upgradeStrategy)
log.Infof(ctx, "[%s] Parameters provided to drain command: %#v", WorkerRole, fmt.Sprintf("Force: %v, IgnoreAllDaemonSets: %v, DeleteLocalData: %v, Timeout: %v, GracePeriodSeconds: %v", drainHelper.Force, drainHelper.IgnoreAllDaemonSets, drainHelper.DeleteLocalData, drainHelper.Timeout, drainHelper.GracePeriodSeconds)) log.Infof(ctx, "[%s] Parameters provided to drain command: %#v", WorkerRole, fmt.Sprintf("Force: %v, IgnoreAllDaemonSets: %v, DeleteEmptyDirData: %v, Timeout: %v, GracePeriodSeconds: %v", drainHelper.Force, drainHelper.IgnoreAllDaemonSets, drainHelper.DeleteEmptyDirData, drainHelper.Timeout, drainHelper.GracePeriodSeconds))
} }
currentHostsPool := make(map[string]bool) currentHostsPool := make(map[string]bool)