diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2023-10-23 21:29:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-23 21:29:07 +0800 |
| commit | 740f5dafcb5a586717b7fc815c4b09aedda1d3fb (patch) | |
| tree | af40e087d4b1a99e6ce92248481144b91a4633bd | |
| parent | Merge pull request #5074 from WillardHu/automated-cherry-pick-of-#5047-upstre... (diff) | |
| parent | fix remove pod failed (diff) | |
| download | kubeedge-740f5dafcb5a586717b7fc815c4b09aedda1d3fb.tar.gz | |
Merge pull request #5104 from Shelley-BaoYue/automated-cherry-pick-of-#5045-upstream-release-1.14
Automated cherry pick of #5045: fix remove pod failed
| -rw-r--r-- | edge/pkg/edged/edged.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go index ef7fcd225..c300949c2 100644 --- a/edge/pkg/edged/edged.go +++ b/edge/pkg/edged/edged.go @@ -302,15 +302,16 @@ func (e *edged) handlePod(op string, content []byte, updatesChan chan<- interfac pods = append(pods, &pod) if filterPodByNodeName(&pod, e.nodeName) { + var podOp kubelettypes.PodOperation switch op { - case model.InsertOperation: - klog.V(4).InfoS("Receive message of adding new pods", "pods", klog.KObjs(pods)) - case model.UpdateOperation: - klog.V(4).InfoS("Receive message of updating pods", "pods", klog.KObjs(pods)) + case model.InsertOperation, model.UpdateOperation: + klog.V(4).InfoS("Receive message of add/update pods", "operation", op, "pods", klog.KObjs(pods)) + podOp = kubelettypes.UPDATE case model.DeleteOperation: klog.V(4).InfoS("Receive message of deleting pods", "pods", klog.KObjs(pods)) + podOp = kubelettypes.REMOVE } - updates := &kubelettypes.PodUpdate{Op: kubelettypes.UPDATE, Pods: pods, Source: kubelettypes.ApiserverSource} + updates := &kubelettypes.PodUpdate{Op: podOp, Pods: pods, Source: kubelettypes.ApiserverSource} updatesChan <- *updates } |