Fix UT

Signed-off-by: clarklee92 <[email protected]>

Author: clarklee92

cloudprovider/amazonswebservices/nlb.go

@@ -133,7 +133,7 @@ func (n *NlbPlugin) Alias() string {
 func (n *NlbPlugin) Init(c client.Client, options cloudprovider.CloudProviderOptions, ctx context.Context) error {
 	n.mutex.Lock()
 	defer n.mutex.Unlock()
-	err := startWatchTargetGroup(ctx)
+	err := startWatchTargetGroup()
 	if err != nil {
 		return err
 	}
@@ -245,13 +245,29 @@ func (n *NlbPlugin) OnPodUpdated(c client.Client, pod *corev1.Pod, ctx context.C
 
 	// enable network
 	if !networkManager.GetNetworkDisabled() {
-		tgbList := &elbv2api.TargetGroupBindingList{}
-		err = c.List(ctx, tgbList, client.MatchingLabels{ResourceTagKey: ResourceTagValue, SvcSelectorKey: pod.GetName()})
+		selector := client.MatchingLabels{
+			ResourceTagKey: ResourceTagValue,
+			SvcSelectorKey: pod.GetName(),
+		}
+		var tgbList elbv2api.TargetGroupBindingList
+		err = c.List(ctx, &tgbList, selector)
 		if err != nil {
 			return pod, cperrors.ToPluginError(err, cperrors.ApiCallError)
 		}
 		if len(tgbList.Items) != len(svc.Spec.Ports) {
-			return pod, cperrors.ToPluginError(n.syncTargetGroupAndService(lbConfig, pod, c, ctx), cperrors.ApiCallError)
+			var tgList ackv1alpha1.TargetGroupList
+			err = c.List(ctx, &tgList, selector)
+			if err != nil {
+				return pod, cperrors.ToPluginError(err, cperrors.ApiCallError)
+			}
+			patch := client.RawPatch(types.MergePatchType,
+				[]byte(fmt.Sprintf(`{"metadata":{"labels":{"%s":"false"}}}`, AWSTargetGroupSyncStatus)))
+			for _, tg := range tgList.Items {
+				err = c.Patch(ctx, &tg, patch)
+				if err != nil {
+					return pod, cperrors.ToPluginError(err, cperrors.ApiCallError)
+				}
+			}
 		}
 	}
 
@@ -580,6 +596,8 @@ func watchTargetGroup(ctx context.Context) error {
 					if err != nil {
 						continue
 					}
+					log.Infof("targetGroup sync request watched, start to sync %s/%s, ARN: %s",
+						targetGroup.GetNamespace(), targetGroup.GetName(), targetGroupARN)
 					err = syncListenerAndTargetGroupBinding(ctx, cw, targetGroup, &targetGroupARN)
 					if err != nil {
 						log.Errorf("syncListenerAndTargetGroupBinding by targetGroup %s error %v",
@@ -600,10 +618,13 @@ func watchTargetGroup(ctx context.Context) error {
 	return nil
 }
 
-func startWatchTargetGroup(ctx context.Context) error {
+func startWatchTargetGroup() error {
 	var err error
 	startOnce.Do(func() {
-		err = watchTargetGroup(ctx)
+		err = watchTargetGroup(context.Background())
+		if err == nil {
+			log.Info("start to watch TargetGroups successfully")
+		}
 	})
 	return err
 }

cloudprovider/amazonswebservices/nlb_test.go

@@ -193,14 +193,16 @@ func TestParseLbConfig(t *testing.T) {
 
 func TestInitLbCache(t *testing.T) {
 	test := struct {
+		n           *NlbPlugin
 		svcList     []corev1.Service
-		minPort     int32
-		maxPort     int32
 		cache       map[string]portAllocated
 		podAllocate map[string]*nlbPorts
 	}{
-		minPort: 951,
-		maxPort: 1000,
+		n: &NlbPlugin{
+			minPort: 951,
+			maxPort: 1000,
+		},
+
 		cache: map[string]portAllocated{
 			"arn:aws:elasticloadbalancing:us-east-1:888888888888:loadbalancer/net/aaa/3b332e6841f23870": map[int32]bool{
 				988: true,
@@ -275,15 +277,15 @@ func TestInitLbCache(t *testing.T) {
 		},
 	}
 
-	actualCache, actualPodAllocate := initLbCache(test.svcList, test.minPort, test.maxPort)
+	test.n.initLbCache(test.svcList)
 	for arn, pa := range test.cache {
 		for port, isAllocated := range pa {
-			if actualCache[arn][port] != isAllocated {
-				t.Errorf("nlb arn %s port %d isAllocated, expect: %t, actual: %t", arn, port, isAllocated, actualCache[arn][port])
+			if test.n.cache[arn][port] != isAllocated {
+				t.Errorf("nlb arn %s port %d isAllocated, expect: %t, actual: %t", arn, port, isAllocated, test.n.cache[arn][port])
 			}
 		}
 	}
-	if !reflect.DeepEqual(actualPodAllocate, test.podAllocate) {
-		t.Errorf("podAllocate expect %v, but actully got %v", test.podAllocate, actualPodAllocate)
+	if !reflect.DeepEqual(test.n.podAllocate, test.podAllocate) {
+		t.Errorf("podAllocate expect %v, but actully got %v", test.podAllocate, test.n.podAllocate)
 	}
 }

go.mod

@@ -5,7 +5,6 @@ go 1.19
 require (
 	github.com/BurntSushi/toml v1.2.1
 	github.com/aws-controllers-k8s/elbv2-controller v0.0.9
-	github.com/aws-controllers-k8s/runtime v0.34.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/kr/pretty v0.3.1
 	github.com/onsi/ginkgo v1.16.5
@@ -32,6 +31,7 @@ require (
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
+	github.com/aws-controllers-k8s/runtime v0.34.0 // indirect
 	github.com/aws/aws-sdk-go v1.50.20 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect