fix: pod get deleted between configure nb and patch pod

Sometimes pod get deleted between configure nb and patch pod. Then we need to recycle resources again.
kubeovn · May 28, 2020 · f7fdd2d · f7fdd2d
1 parent 7d66433
commit f7fdd2d
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -377,6 +377,9 @@ func (c *Controller) handleAddPod(key string) error {
 
 	if _, err := c.config.KubeClient.CoreV1().Pods(namespace).Patch(name, types.JSONPatchType, generatePatchPayload(pod.Annotations, op)); err != nil {
 		if k8serrors.IsNotFound(err) {
+			// Sometimes pod is deleted between kube-ovn configure ovn-nb and patch pod.
+			// Then we need to recycle the resource again.
+			c.deletePodQueue.AddRateLimited(key)
 			return nil
 		}
 		klog.Errorf("patch pod %s/%s failed %v", name, namespace, err)
@@ -459,6 +462,12 @@ func (c *Controller) handleUpdatePod(key string) error {
 
 	pod.Annotations[util.RoutedAnnotation] = "true"
 	if _, err := c.config.KubeClient.CoreV1().Pods(namespace).Patch(name, types.JSONPatchType, generatePatchPayload(pod.Annotations, "replace")); err != nil {
+		if k8serrors.IsNotFound(err) {
+			// Sometimes pod is deleted between kube-ovn configure ovn-nb and patch pod.
+			// Then we need to recycle the resource again.
+			c.deletePodQueue.AddRateLimited(key)
+			return nil
+		}
 		klog.Errorf("patch pod %s/%s failed %v", name, namespace, err)
 		return err
 	}