Merge pull request #543 from kmesh-bot/cherry-pick-540-to-release-0.4

[release-0.4] Fix TestPodSidecarLabelChangeTriggersAddIptablesAction flake

pkg/controller/bypass/bypass_controller.go

@@ -54,7 +54,6 @@ func StartByPassController(client kubernetes.Interface, stopChan <-chan struct{}
 	informerFactory := informers.NewSharedInformerFactoryWithOptions(client, DefaultInformerSyncPeriod,
 		informers.WithTweakListOptions(func(options *metav1.ListOptions) {
 			options.FieldSelector = fmt.Sprintf("spec.nodeName=%s", nodeName)
-			options.LabelSelector = LabelSelectorBypass
 		}))
 
 	informerFactory.Start(wait.NeverStop)
@@ -69,6 +68,9 @@ func StartByPassController(client kubernetes.Interface, stopChan <-chan struct{}
 				log.Errorf("expected *corev1.Pod but got %T", obj)
 				return
 			}
+			if !shouldEnroll(pod) {
+				return
+			}
 
 			log.Infof("%s/%s: enable bypass control", pod.GetNamespace(), pod.GetName())
 			enableSidecar, _ := checkSidecar(client, pod)
@@ -127,6 +129,8 @@ func StartByPassController(client kubernetes.Interface, stopChan <-chan struct{}
 				}
 			}
 		},
+		// We donot need to process delete here, because in bpf mode, it will be handled by kmesh-cni.
+		// In istio sidecar mode, we donot need to delete the iptables.
 	}); err != nil {
 		return fmt.Errorf("error adding event handler to podInformer: %v", err)
 	}

pkg/controller/bypass/bypass_test.go

@@ -172,7 +172,7 @@ func TestPodSidecarLabelChangeTriggersAddIptablesAction(t *testing.T) {
 	}
 
 	wg.Add(1)
-	_, err = client.CoreV1().Pods("default").Create(context.TODO(), pod, metav1.CreateOptions{})
+	_, err = client.CoreV1().Pods(namespaceName).Create(context.TODO(), pod, metav1.CreateOptions{})
 	assert.NoError(t, err)
 
 	wg.Wait()
@@ -181,9 +181,10 @@ func TestPodSidecarLabelChangeTriggersAddIptablesAction(t *testing.T) {
 	enabled = false
 	disabled = false
 
-	delete(pod.Labels, "kmesh.net/bypass")
+	newPod := pod.DeepCopy()
+	delete(newPod.Labels, "kmesh.net/bypass")
 	wg.Add(1)
-	_, err = client.CoreV1().Pods("default").Update(context.TODO(), pod, metav1.UpdateOptions{})
+	_, err = client.CoreV1().Pods(namespaceName).Update(context.TODO(), newPod, metav1.UpdateOptions{})
 	assert.NoError(t, err)
 
 	wg.Wait()