(cloudstack) branch 4.19 updated: CKS: use --delete-emptydir-data instead of deprecated --delete-local-data (#10234)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.19 by this push:
     new b9890875cc1 CKS: use --delete-emptydir-data instead of deprecated 
--delete-local-data (#10234)
b9890875cc1 is described below

commit b9890875cc153d7a2af40c71b975ac32c4559c6c
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Thu Jan 30 15:49:26 2025 +0100

    CKS: use --delete-emptydir-data instead of deprecated --delete-local-data 
(#10234)
---
 .../kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
index 5b496509eeb..d666293d02a 100644
--- 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
+++ 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
@@ -203,7 +203,7 @@ public class KubernetesClusterScaleWorker extends 
KubernetesClusterResourceModif
             retryCounter++;
             try {
                 Pair<Boolean, String> result = SshHelper.sshExecute(ipAddress, 
port, getControlNodeLoginUser(),
-                        pkFile, null, String.format("sudo /opt/bin/kubectl 
drain %s --ignore-daemonsets --delete-local-data", hostName),
+                        pkFile, null, String.format("sudo /opt/bin/kubectl 
drain %s --ignore-daemonsets --delete-emptydir-data", hostName),
                         10000, 10000, 60000);
                 if (!result.first()) {
                     LOGGER.warn(String.format("Draining node: %s on VM : %s in 
Kubernetes cluster : %s unsuccessful", hostName, userVm.getDisplayName(), 
kubernetesCluster.getName()));