From e70f5ca3881f603bfd5ce13e5f6fd6c66fadd54f Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 8 Dec 2020 16:32:07 -0700 Subject: [PATCH] DeleteLocalData is now DeleteEmptyDirData in k8s v1.20 --- services/controlplane.go | 2 +- services/node_util.go | 2 +- services/workerplane.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/controlplane.go b/services/controlplane.go index 3123ba5f..2318a0cc 100644 --- a/services/controlplane.go +++ b/services/controlplane.go @@ -70,7 +70,7 @@ func UpgradeControlPlaneNodes(ctx context.Context, kubeClient *kubernetes.Client } if upgradeStrategy.Drain != nil && *upgradeStrategy.Drain { 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 if len(inactiveHosts) > 0 { diff --git a/services/node_util.go b/services/node_util.go index e6b73ddc..42b590c0 100644 --- a/services/node_util.go +++ b/services/node_util.go @@ -57,7 +57,7 @@ func getDrainHelper(kubeClient *kubernetes.Clientset, upgradeStrategy v3.NodeUpg Client: kubeClient, Force: upgradeStrategy.DrainInput.Force, IgnoreAllDaemonSets: ignoreDaemonSets, - DeleteLocalData: upgradeStrategy.DrainInput.DeleteLocalData, + DeleteEmptyDirData: upgradeStrategy.DrainInput.DeleteLocalData, GracePeriodSeconds: upgradeStrategy.DrainInput.GracePeriod, Timeout: time.Second * time.Duration(upgradeStrategy.DrainInput.Timeout), Out: bytes.NewBuffer([]byte{}), diff --git a/services/workerplane.go b/services/workerplane.go index d89bfe82..d630cc04 100644 --- a/services/workerplane.go +++ b/services/workerplane.go @@ -103,7 +103,7 @@ func processWorkerPlaneForUpgrade(ctx context.Context, kubeClient *kubernetes.Cl hostsQueue := util.GetObjectQueue(allHosts) if upgradeStrategy.Drain != nil && *upgradeStrategy.Drain { 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)