Merge pull request vmware-tanzu#470 from jwsui/remove-tag

Remove SubnetTypeCR tag

pkg/controllers/subnet/subnet_controller.go

@@ -308,17 +308,19 @@ func (r *SubnetReconciler) GarbageCollector(cancel chan bool, timeout time.Durat
 			return
 		case <-time.After(timeout):
 		}
-		nsxSubnetList := r.Service.ListSubnetCreatedByCR()
-		if len(nsxSubnetList) == 0 {
-			continue
-		}
-
 		crdSubnetList := &v1alpha1.SubnetList{}
 		err := r.Client.List(ctx, crdSubnetList)
 		if err != nil {
 			log.Error(err, "failed to list subnet CR")
 			continue
 		}
+		var nsxSubnetList []model.VpcSubnet
+		for _, subnet := range crdSubnetList.Items {
+			nsxSubnetList = append(nsxSubnetList, r.Service.ListSubnetCreatedBySubnet(string(subnet.UID))...)
+		}
+		if len(nsxSubnetList) == 0 {
+			continue
+		}
 
 		crdSubnetIDs := sets.NewString()
 		for _, sr := range crdSubnetList.Items {

pkg/controllers/subnet/subnet_controller_test.go

@@ -32,8 +32,8 @@ func TestSubnetReconciler_GarbageCollector(t *testing.T) {
 	}
 	// Subnet doesn't have TagScopeSubnetSetCRId (not  belong to SubnetSet)
 	// gc collect item "2345", local store has more item than k8s cache
-	patch := gomonkey.ApplyMethod(reflect.TypeOf(service), "ListSubnetCreatedByCR", func(_ *subnet.SubnetService) []model.VpcSubnet {
-		a := []model.VpcSubnet{}
+	patch := gomonkey.ApplyMethod(reflect.TypeOf(service), "ListSubnetCreatedBySubnet", func(_ *subnet.SubnetService, uid string) []model.VpcSubnet {
+		var a []model.VpcSubnet
 		id1 := "2345"
 		a = append(a, model.VpcSubnet{Id: &id1})
 		id2 := "1234"
@@ -70,8 +70,8 @@ func TestSubnetReconciler_GarbageCollector(t *testing.T) {
 
 	// local store has same item as k8s cache
 	patch.Reset()
-	patch.ApplyMethod(reflect.TypeOf(service), "ListSubnetCreatedByCR", func(_ *subnet.SubnetService) []model.VpcSubnet {
-		a := []model.VpcSubnet{}
+	patch.ApplyMethod(reflect.TypeOf(service), "ListSubnetCreatedBySubnet", func(_ *subnet.SubnetService, uid string) []model.VpcSubnet {
+		var a []model.VpcSubnet
 		id := "1234"
 		a = append(a, model.VpcSubnet{Id: &id})
 		return a
@@ -95,14 +95,14 @@ func TestSubnetReconciler_GarbageCollector(t *testing.T) {
 
 	// local store has no item
 	patch.Reset()
-	patch.ApplyMethod(reflect.TypeOf(service), "ListSubnetCreatedByCR", func(_ *subnet.SubnetService) []model.VpcSubnet {
+	patch.ApplyMethod(reflect.TypeOf(service), "ListSubnetCreatedBySubnet", func(_ *subnet.SubnetService, uid string) []model.VpcSubnet {
 		return []model.VpcSubnet{}
 	})
 	patch.ApplyMethod(reflect.TypeOf(service), "DeleteSubnet", func(_ *subnet.SubnetService, subnet model.VpcSubnet) error {
 		assert.FailNow(t, "should not be called")
 		return nil
 	})
-	k8sClient.EXPECT().List(ctx, srList).Return(nil).Times(0)
+	k8sClient.EXPECT().List(ctx, srList).Return(nil).Times(1)
 	go func() {
 		time.Sleep(1 * time.Second)
 		cancel <- true

pkg/controllers/subnetset/subnetset_controller.go

@@ -235,8 +235,10 @@ func (r *SubnetSetReconciler) GarbageCollector(cancel chan bool, timeout time.Du
 			log.Error(err, "failed to list SubnetSet CR")
 			continue
 		}
-
-		nsxSubnetList := r.Service.ListSubnetCreatedBySubnetSet()
+		var nsxSubnetList []model.VpcSubnet
+		for _, subnetSet := range subnetSetList.Items {
+			nsxSubnetList = append(nsxSubnetList, r.Service.ListSubnetCreatedBySubnetSet(string(subnetSet.UID))...)
+		}
 		if len(nsxSubnetList) == 0 {
 			continue
 		}

pkg/nsx/services/common/types.go

@@ -56,7 +56,6 @@ const (
 	LabelDefaultPodSubnetSet        string = "Pod"
 	DefaultPodSubnetSet             string = "pod-default"
 	DefaultVMSubnetSet              string = "vm-default"
-	TagScopeSubnetCRType            string = "nsx-op/subnet_type"
 	TagScopeSubnetCRUID             string = "nsx-op/subnet_uid"
 	TagScopeSubnetCRName            string = "nsx-op/subnet_name"
 	TagScopeSubnetSetCRName         string = "nsx-op/subnetset_name"

pkg/nsx/services/subnet/store.go

@@ -38,17 +38,6 @@ func subnetIndexFunc(obj interface{}) ([]string, error) {
 	}
 }
 
-// subnetTypeIndexFunc is used to filter out NSX Subnets which are tagged with subnetcr type.
-// TODO, change it to use "nsx-op/subnetset_cr_uid" and "nsx-op/subnet_cr_uid"
-func subnetTypeIndexFunc(obj interface{}) ([]string, error) {
-	switch o := obj.(type) {
-	case model.VpcSubnet:
-		return filterTag(o.Tags, common.TagScopeSubnetCRType), nil
-	default:
-		return nil, errors.New("subnetIndexFunc doesn't support unknown type")
-	}
-}
-
 // subnetIndexFunc is used to filter out NSX Subnets which are tagged with CR UID.
 func subnetSetIndexFunc(obj interface{}) ([]string, error) {
 	switch o := obj.(type) {

pkg/nsx/services/subnet/subnet.go

@@ -73,7 +73,6 @@ func InitializeSubnetService(service common.Service) (*SubnetService, error) {
 			ResourceStore: common.ResourceStore{
 				Indexer: cache.NewIndexer(keyFunc, cache.Indexers{
 					common.TagScopeSubnetCRUID:    subnetIndexFunc,
-					common.TagScopeSubnetCRType:   subnetTypeIndexFunc,
 					common.TagScopeSubnetSetCRUID: subnetSetIndexFunc,
 				}),
 				BindingType: model.VpcSubnetBindingType(),
@@ -174,21 +173,12 @@ func (service *SubnetService) DeleteSubnet(nsxSubnet model.VpcSubnet) error {
 	return nil
 }
 
-func (service *SubnetService) ListSubnetCreatedByCR() []model.VpcSubnet {
-	return service.listSubnetByCRType("subnet")
+func (service *SubnetService) ListSubnetCreatedBySubnet(id string) []model.VpcSubnet {
+	return service.SubnetStore.GetByIndex(common.TagScopeSubnetCRUID, id)
 }
 
-func (service *SubnetService) listSubnetByCRType(crType string) []model.VpcSubnet {
-	subnets := service.SubnetStore.GetByIndex(common.TagScopeSubnetCRType, crType)
-	subnetList := []model.VpcSubnet{}
-	for _, subnet := range subnets {
-		subnetList = append(subnetList, subnet)
-	}
-	return subnetList
-}
-
-func (service *SubnetService) ListSubnetCreatedBySubnetSet() []model.VpcSubnet {
-	return service.listSubnetByCRType("subnetset")
+func (service *SubnetService) ListSubnetCreatedBySubnetSet(id string) []model.VpcSubnet {
+	return service.SubnetStore.GetByIndex(common.TagScopeSubnetSetCRUID, id)
 }
 
 func (service *SubnetService) ListSubnetSetID(ctx context.Context) sets.String {

pkg/util/utils.go

@@ -364,11 +364,9 @@ func BuildBasicTags(cluster string, obj interface{}, namespaceID types.UID) []mo
 	case *v1alpha1.Subnet:
 		tags = append(tags, model.Tag{Scope: String(common.TagScopeSubnetCRName), Tag: String(i.ObjectMeta.Name)})
 		tags = append(tags, model.Tag{Scope: String(common.TagScopeSubnetCRUID), Tag: String(string(i.UID))})
-		tags = append(tags, model.Tag{Scope: String(common.TagScopeSubnetCRType), Tag: String(SubnetTypeSubnet)})
 	case *v1alpha1.SubnetSet:
 		tags = append(tags, model.Tag{Scope: String(common.TagScopeSubnetSetCRName), Tag: String(i.ObjectMeta.Name)})
 		tags = append(tags, model.Tag{Scope: String(common.TagScopeSubnetSetCRUID), Tag: String(string(i.UID))})
-		tags = append(tags, model.Tag{Scope: String(common.TagScopeSubnetCRType), Tag: String(SubnetTypeSubnetSet)})
 	case *v1alpha1.SubnetPort:
 		tags = append(tags, model.Tag{Scope: String(common.TagScopeVMNamespace), Tag: String(i.ObjectMeta.Namespace)})
 		isVmSubnetPort = true