Fix deletion of the pod created by blueprint without namespace (#2106)

* fix deletion of the pod created by BP without NS * Update pkg/kube/pod_controller.go Co-authored-by: Pavan Navarathna <6504783+pavannd1@users.noreply.github.com> --------- Co-authored-by: Pavan Navarathna <6504783+pavannd1@users.noreply.github.com>
kanisterio · Jun 14, 2023 · f90d50a · f90d50a
1 parent 69af1af
commit f90d50a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/pkg/kube/pod_controller.go b/pkg/kube/pod_controller.go
@@ -177,8 +177,8 @@ func (p *podController) StopPod(ctx context.Context, stopTimeout time.Duration,
 		defer cancel()
 	}
 
-	if err := p.pcp.deletePod(ctx, p.podOptions.Namespace, p.podName, metav1.DeleteOptions{GracePeriodSeconds: &gracePeriodSeconds}); err != nil {
-		log.WithError(err).Print("Failed to delete pod", field.M{"PodName": p.podName, "Namespace": p.podOptions.Namespace})
+	if err := p.pcp.deletePod(ctx, p.pod.Namespace, p.podName, metav1.DeleteOptions{GracePeriodSeconds: &gracePeriodSeconds}); err != nil {
+		log.WithError(err).Print("Failed to delete pod", field.M{"PodName": p.podName, "Namespace": p.pod.Namespace})
 		return err
 	}
 

diff --git a/pkg/kube/pod_controller_test.go b/pkg/kube/pod_controller_test.go
@@ -231,7 +231,8 @@ func (s *PodControllerTestSuite) TestPodControllerStopPod(c *C) {
 		"Pod deletion error": func(pcp *fakePodControllerProcessor, pc PodController) {
 			pcp.createPodRet = &corev1.Pod{
 				ObjectMeta: metav1.ObjectMeta{
-					Name: podControllerPodName,
+					Name:      podControllerPodName,
+					Namespace: podControllerNS,
 				},
 			}
 			err := pc.StartPod(ctx)
@@ -245,7 +246,8 @@ func (s *PodControllerTestSuite) TestPodControllerStopPod(c *C) {
 		"Pod successfully deleted": func(pcp *fakePodControllerProcessor, pc PodController) {
 			pcp.createPodRet = &corev1.Pod{
 				ObjectMeta: metav1.ObjectMeta{
-					Name: podControllerPodName,
+					Name:      podControllerPodName,
+					Namespace: podControllerNS,
 				},
 			}
 			err := pc.StartPod(ctx)
@@ -270,8 +272,7 @@ func (s *PodControllerTestSuite) TestPodControllerStopPod(c *C) {
 		}
 
 		pc := NewPodController(cli, &PodOptions{
-			Namespace: podControllerNS,
-			Name:      podControllerPodName,
+			Name: podControllerPodName,
 		}, WithPodControllerProcessor(pcp))
 
 		tc(pcp, pc)