Merge pull request #601 from hzxuzhonghu/rm-resync

remove resync period
kmesh-net · Jul 19, 2024 · d0f10ea · d0f10ea
2 parents 0d2e1af + df1c32c
commit d0f10ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/pkg/controller/bypass/bypass_controller.go b/pkg/controller/bypass/bypass_controller.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"time"
 
 	netns "github.com/containernetworking/plugins/pkg/ns"
 	corev1 "k8s.io/api/core/v1"
@@ -42,16 +41,13 @@ var (
 )
 
 const (
-	DefaultInformerSyncPeriod = 30 * time.Second
-	LabelSelectorBypass       = "kmesh.net/bypass=enabled"
-	KmeshAnnotation           = "kmesh.net/redirection"
-	SidecarAnnotation         = "sidecar.istio.io/inject"
+	SidecarAnnotation = "sidecar.istio.io/inject"
 )
 
 func StartByPassController(client kubernetes.Interface, stopChan <-chan struct{}) error {
 	nodeName := os.Getenv("NODE_NAME")
 
-	informerFactory := informers.NewSharedInformerFactoryWithOptions(client, DefaultInformerSyncPeriod,
+	informerFactory := informers.NewSharedInformerFactoryWithOptions(client, 0,
 		informers.WithTweakListOptions(func(options *metav1.ListOptions) {
 			options.FieldSelector = fmt.Sprintf("spec.nodeName=%s", nodeName)
 		}))
@@ -242,7 +238,7 @@ func checkSidecar(client kubernetes.Interface, pod *corev1.Pod) (bool, error) {
 func isKmeshManaged(pod *corev1.Pod) bool {
 	annotations := pod.Annotations
 	if annotations != nil {
-		if value, ok := annotations[KmeshAnnotation]; ok && value == "enabled" {
+		if value, ok := annotations[constants.KmeshRedirectionAnnotation]; ok && value == "enabled" {
 			return true
 		}
 	}

diff --git a/pkg/controller/manage/kmesh_manage.go b/pkg/controller/manage/kmesh_manage.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"time"
 
 	netns "github.com/containernetworking/plugins/pkg/ns"
 	"istio.io/istio/pkg/spiffe"
@@ -54,10 +53,9 @@ var (
 )
 
 const (
-	DefaultInformerSyncPeriod = 2 * time.Second
-	MaxRetries                = 5
-	ActionAddAnnotation       = "add"
-	ActionDeleteAnnotation    = "delete"
+	MaxRetries             = 5
+	ActionAddAnnotation    = "add"
+	ActionDeleteAnnotation = "delete"
 )
 
 type QueueItem struct {
@@ -68,7 +66,7 @@ type QueueItem struct {
 func NewKmeshManageController(client kubernetes.Interface, security *kmeshsecurity.SecretManager) (*KmeshManageController, error) {
 	nodeName := os.Getenv("NODE_NAME")
 
-	informerFactory := informers.NewSharedInformerFactoryWithOptions(client, DefaultInformerSyncPeriod,
+	informerFactory := informers.NewSharedInformerFactoryWithOptions(client, 0,
 		informers.WithTweakListOptions(func(options *metav1.ListOptions) {
 			options.FieldSelector = fmt.Sprintf("spec.nodeName=%s", nodeName)
 		}))