Make NodeTopologyInformer only looks for the cluster-wide CR.

sawsa307 · Oct 1, 2024 · 45b4782 · 45b4782
1 parent 0cc42d7
commit 45b4782
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/context/context.go b/pkg/context/context.go
@@ -230,7 +230,9 @@ func NewControllerContext(
 
 	if flags.F.EnableMultiSubnetClusterPhase1 {
 		if nodeTopologyClient != nil {
-			context.NodeTopologyInformer = informernodetopology.NewNodeTopologyInformer(nodeTopologyClient, config.ResyncPeriod, utils.NewNamespaceIndexer())
+			context.NodeTopologyInformer = informernodetopology.NewFilteredNodeTopologyInformer(nodeTopologyClient, config.ResyncPeriod, utils.NewNamespaceIndexer(), func(listOptions *metav1.ListOptions) {
+				listOptions.FieldSelector = fmt.Sprintf("metadata.name=%s", flags.F.NodeTopologyCRName)
+			})
 		}
 	}
 

diff --git a/pkg/flags/flags.go b/pkg/flags/flags.go
@@ -136,6 +136,7 @@ var (
 		EnableIGMultiSubnetCluster               bool
 		EnableMultiSubnetCluster                 bool
 		EnableMultiSubnetClusterPhase1           bool
+		NodeTopologyCRName                       string
 		EnableWeightedL4ILB                      bool
 		EnableWeightedL4NetLB                    bool
 		EnableDiscretePortForwarding             bool
@@ -322,6 +323,7 @@ L7 load balancing. CSV values accepted. Example: -node-port-ranges=80,8080,400-5
 	flag.BoolVar(&F.EnableIGMultiSubnetCluster, "enable-ig-multi-subnet-cluster", false, "Enable Multi Subnet support for the controllers that use Instance Group backends.")
 	flag.BoolVar(&F.EnableMultiSubnetCluster, "enable-multi-subnet-cluster", false, "Enable Multi Subnet support for all controllers that are running.")
 	flag.BoolVar(&F.EnableMultiSubnetClusterPhase1, "enable-multi-subnet-cluster-phase1", false, "Enable Phase 1 Multi Subnet support for all controllers that are running.")
+	flag.StringVar(&F.NodeTopologyCRName, "node-topology-cr-name", "default", "The name of the Node Topology CR.")
 	flag.BoolVar(&F.EnableWeightedL4ILB, "enable-weighted-l4-ilb", false, "Enable Weighted Load balancing for L4 ILB.")
 	flag.BoolVar(&F.EnableWeightedL4NetLB, "enable-weighted-l4-netlb", false, "EnableWeighted Load balancing for  L4 NetLB .")
 	flag.Float32Var(&F.KubeClientQPS, "kube-client-qps", 0.0, "The QPS that the controllers' kube client should adhere to through client side throttling. If zero, client will be created with default settings.")