(dubbo-kubernetes) branch master updated: [horus] fix evict pods failed (#341)

[zhongxjian]

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

zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git


The following commit(s) were added to refs/heads/master by this push:
     new 561cf8a2 [horus] fix evict pods failed (#341)
561cf8a2 is described below

commit 561cf8a236445e850f7efb33f51adceb81a1465f
Author: mfordjody <11638...@qq.com>
AuthorDate: Fri Sep 13 14:36:54 2024 +0800

    [horus] fix evict pods failed (#341)
---
 app/horus/core/horuser/action.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/horus/core/horuser/action.go b/app/horus/core/horuser/action.go
index 01dced5a..3df16c58 100644
--- a/app/horus/core/horuser/action.go
+++ b/app/horus/core/horuser/action.go
@@ -97,7 +97,7 @@ func (h *Horuser) Evict(podName, podNamespace, clusterName 
string) (err error) {
        kubeClient := h.kubeClientMap[clusterName]
        if kubeClient == nil {
                klog.Errorf("pod Evict kubeClient by clusterName empty.")
-               klog.Infof("podName:%v clusterName:%v", podName, clusterName)
+               klog.Infof("podName:%v podNamespace:%v clusterName:%v", 
podName, podNamespace, clusterName)
                return err
        }
 
@@ -105,16 +105,21 @@ func (h *Horuser) Evict(podName, podNamespace, 
clusterName string) (err error) {
        defer cancelFirst()
        _, err = kubeClient.CoreV1().Pods(podNamespace).Get(ctxFirst, podName, 
v1.GetOptions{})
        if err != nil {
-               klog.Errorf("pod Evict get err clusterName:%v podName:%v", 
clusterName, podName)
+               klog.Errorf("pod Evict get err clusterName:%v podName:%v 
podNamespace:%v", clusterName, podName, podNamespace)
                return err
        }
-
        ctxSecond, cancelSecond := h.GetK8sContext()
        defer cancelSecond()
-       err = kubeClient.CoreV1().Pods(podNamespace).Delete(ctxSecond, podName, 
v1.DeleteOptions{})
+       var gracePeriodSeconds int64 = -1
+       propagationPolicy := v1.DeletePropagationBackground
+       err = kubeClient.CoreV1().Pods(podNamespace).Delete(ctxSecond, podName, 
v1.DeleteOptions{
+               GracePeriodSeconds: &gracePeriodSeconds,
+               PropagationPolicy:  &propagationPolicy,
+       })
        if err != nil {
-               klog.Errorf("pod Evict delete err clusterName:%v podName:%v", 
clusterName, podName)
+               klog.Errorf("pod Evict delete err clusterName:%v podName:%v 
podNamespace:%v", clusterName, podName, podNamespace)
                return err
        }
+       klog.Infof("pod Evict delete success clusterName:%v podName:%v 
podNamespace:%v", clusterName, podName, podNamespace)
        return nil
 }