Address comments to add descriptive names

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

cmd/antrea-controller/controller.go

@@ -119,7 +119,7 @@ func run(o *Options) error {
 	tfInformer := crdInformerFactory.Crd().V1alpha1().Traceflows()
 	cgv1a2Informer := crdInformerFactory.Crd().V1alpha2().ClusterGroups()
 	cgInformer := crdInformerFactory.Crd().V1alpha3().ClusterGroups()
-	gInformer := crdInformerFactory.Crd().V1alpha3().Groups()
+	grpInformer := crdInformerFactory.Crd().V1alpha3().Groups()
 	egressInformer := crdInformerFactory.Crd().V1alpha2().Egresses()
 	externalIPPoolInformer := crdInformerFactory.Crd().V1alpha2().ExternalIPPools()
 
@@ -161,7 +161,7 @@ func run(o *Options) error {
 		anpInformer,
 		tierInformer,
 		cgInformer,
-		gInformer,
+		grpInformer,
 		addressGroupStore,
 		appliedToGroupStore,
 		networkPolicyStore,

pkg/controller/networkpolicy/antreanetworkpolicy.go

@@ -196,7 +196,7 @@ func (n *NetworkPolicyController) processAppliedTo(namespace string, appliedTo [
 	for _, at := range appliedTo {
 		var atg string
 		if at.Group != "" {
-			atg = n.processAppliedToGroupForG(namespace, at.Group)
+			atg = n.processAppliedToGroupForGroup(namespace, at.Group)
 		} else {
 			atg = n.createAppliedToGroup(namespace, at.PodSelector, at.NamespaceSelector, at.ExternalEntitySelector)
 		}
@@ -208,9 +208,9 @@ func (n *NetworkPolicyController) processAppliedTo(namespace string, appliedTo [
 	return appliedToGroupNames
 }
 
-func (n *NetworkPolicyController) processAppliedToGroupForG(namespace, groupName string) string {
+func (n *NetworkPolicyController) processAppliedToGroupForGroup(namespace, groupName string) string {
 	// Retrieve Group for corresponding entry in the AppliedToGroup.
-	g, err := n.gLister.Groups(namespace).Get(groupName)
+	g, err := n.grpLister.Groups(namespace).Get(groupName)
 	if err != nil {
 		// This error should not occur as we validate that a Group must exist before
 		// referencing it in an ANP.

pkg/controller/networkpolicy/antreanetworkpolicy_test.go

@@ -563,7 +563,7 @@ func TestDeleteANP(t *testing.T) {
 	assert.False(t, found, "expected internal NetworkPolicy to be deleted")
 }
 
-func TestProcessAppliedToGroupsForG(t *testing.T) {
+func TestProcessAppliedToGroupsForGroup(t *testing.T) {
 	selectorA := metav1.LabelSelector{MatchLabels: map[string]string{"foo1": "bar1"}}
 	cidr := "10.0.0.0/24"
 	// gA with selector present in cache
@@ -629,7 +629,7 @@ func TestProcessAppliedToGroupsForG(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			actualAG := npc.processAppliedToGroupForG(tt.namespace, tt.inputG)
+			actualAG := npc.processAppliedToGroupForGroup(tt.namespace, tt.inputG)
 			assert.Equal(t, tt.expectedAG, actualAG, "appliedToGroup list does not match")
 		})
 	}

pkg/controller/networkpolicy/clustergroup.go

@@ -197,19 +197,7 @@ func (c *NetworkPolicyController) processNextInternalGroupWorkItem() bool {
 	return true
 }
 
-func (n *NetworkPolicyController) syncInternalGroup(key string) error {
-	// Retrieve the internal Group corresponding to this key.
-	grpObj, found, _ := n.internalGroupStore.Get(key)
-	if !found {
-		klog.V(2).Infof("Internal group %s not found.", key)
-		n.groupingInterface.DeleteGroup(clusterGroupType, key)
-		return nil
-	}
-	grp := grpObj.(*antreatypes.Group)
-	if grp.SourceReference.Namespace != "" {
-		// Sync the Group as a Namespaced Group.
-		return n.syncNamespacedInternalGroup(grp)
-	}
+func (n *NetworkPolicyController) syncInternalClusterGroup(grp *antreatypes.Group) error {
 	// Retrieve the ClusterGroup corresponding to this key.
 	cg, err := n.cgLister.Get(grp.SourceReference.ToString())
 	if err != nil {
@@ -231,7 +219,7 @@ func (n *NetworkPolicyController) syncInternalGroup(key string) error {
 			ServiceReference: grp.ServiceReference,
 			ChildGroups:      grp.ChildGroups,
 		}
-		klog.V(2).Infof("Updating existing internal Group %s", key)
+		klog.V(2).Infof("Updating existing internal Group %s", grp.SourceReference.ToString())
 		n.internalGroupStore.Update(updatedGrp)
 	}
 	// Update the ClusterGroup status to Realized as Antrea has recognized the Group and

pkg/controller/networkpolicy/crd_utils.go

@@ -124,7 +124,7 @@ func (n *NetworkPolicyController) toAntreaPeerForCRD(peers []v1alpha1.NetworkPol
 func (n *NetworkPolicyController) processRefGroupOrClusterGroup(g, namespace string) (string, []controlplane.IPBlock) {
 	var key string
 	if namespace != "" {
-		grp, err := n.gLister.Groups(namespace).Get(g)
+		grp, err := n.grpLister.Groups(namespace).Get(g)
 		if err != nil {
 			klog.Errorf("Group %s/%s not found: %v", namespace, g, err)
 			return "", nil
@@ -250,3 +250,19 @@ func getNormalizedNameForSelector(sel *antreatypes.GroupSelector) string {
 	}
 	return ""
 }
+
+func (n *NetworkPolicyController) syncInternalGroup(key string) error {
+	// Retrieve the internal Group corresponding to this key.
+	grpObj, found, _ := n.internalGroupStore.Get(key)
+	if !found {
+		klog.V(2).Infof("Internal group %s not found.", key)
+		n.groupingInterface.DeleteGroup(clusterGroupType, key)
+		return nil
+	}
+	grp := grpObj.(*antreatypes.Group)
+	if grp.SourceReference.Namespace != "" {
+		// Sync the Group as a Namespaced Group.
+		return n.syncInternalNamespacedGroup(grp)
+	}
+	return n.syncInternalClusterGroup(grp)
+}

pkg/controller/networkpolicy/group.go

@@ -154,9 +154,9 @@ func getGroupSourceRef(g *crdv1alpha3.Group) *controlplane.GroupReference {
 	}
 }
 
-func (n *NetworkPolicyController) syncNamespacedInternalGroup(grp *antreatypes.Group) error {
+func (n *NetworkPolicyController) syncInternalNamespacedGroup(grp *antreatypes.Group) error {
 	// Retrieve the Group corresponding to this key.
-	g, err := n.gLister.Groups(grp.SourceReference.Namespace).Get(grp.SourceReference.Name)
+	g, err := n.grpLister.Groups(grp.SourceReference.Namespace).Get(grp.SourceReference.Name)
 	if err != nil {
 		klog.Infof("Didn't find the %s, skip processing of internal group", grp.SourceReference.ToTypedString())
 		return nil

pkg/controller/networkpolicy/networkpolicy_controller.go

@@ -178,13 +178,13 @@ type NetworkPolicyController struct {
 	// once.
 	cgListerSynced cache.InformerSynced
 
-	gInformer crdv1a3informers.GroupInformer
-	// gLister is able to list/get Groups and is populated by the shared informer passed to
+	grpInformer crdv1a3informers.GroupInformer
+	// grpLister is able to list/get Groups and is populated by the shared informer passed to
 	// NewGroupController.
-	gLister crdv1a3listers.GroupLister
-	// gListerSynced is a function which returns true if the Group shared informer has been synced at least
+	grpLister crdv1a3listers.GroupLister
+	// grpListerSynced is a function which returns true if the Group shared informer has been synced at least
 	// once.
-	gListerSynced cache.InformerSynced
+	grpListerSynced cache.InformerSynced
 
 	// addressGroupStore is the storage where the populated Address Groups are stored.
 	addressGroupStore storage.Interface
@@ -237,7 +237,7 @@ func NewNetworkPolicyController(kubeClient clientset.Interface,
 	anpInformer secinformers.NetworkPolicyInformer,
 	tierInformer secinformers.TierInformer,
 	cgInformer crdv1a3informers.ClusterGroupInformer,
-	gInformer crdv1a3informers.GroupInformer,
+	grpInformer crdv1a3informers.GroupInformer,
 	addressGroupStore storage.Interface,
 	appliedToGroupStore storage.Interface,
 	internalNetworkPolicyStore storage.Interface,
@@ -291,9 +291,9 @@ func NewNetworkPolicyController(kubeClient clientset.Interface,
 		n.cgInformer = cgInformer
 		n.cgLister = cgInformer.Lister()
 		n.cgListerSynced = cgInformer.Informer().HasSynced
-		n.gInformer = gInformer
-		n.gLister = gInformer.Lister()
-		n.gListerSynced = gInformer.Informer().HasSynced
+		n.grpInformer = grpInformer
+		n.grpLister = grpInformer.Lister()
+		n.grpListerSynced = grpInformer.Informer().HasSynced
 		// Add handlers for Namespace events.
 		n.namespaceInformer.Informer().AddEventHandlerWithResyncPeriod(
 			cache.ResourceEventHandlerFuncs{
@@ -448,7 +448,7 @@ func NewNetworkPolicyController(kubeClient clientset.Interface,
 			resyncPeriod,
 		)
 		// Add event handlers for Group notification.
-		gInformer.Informer().AddEventHandlerWithResyncPeriod(
+		grpInformer.Informer().AddEventHandlerWithResyncPeriod(
 			cache.ResourceEventHandlerFuncs{
 				AddFunc:    n.addGroup,
 				UpdateFunc: n.updateGroup,

pkg/controller/networkpolicy/validate.go

@@ -701,7 +701,7 @@ func (g *groupValidator) validateChildGroup(s *crdv1alpha3.Group) (string, bool)
 			return fmt.Sprintf("cannot set childGroups for Group %s/%s, who has %d parents", s.Namespace, s.Name, len(parentGrps)), false
 		}
 		for _, groupname := range s.Spec.ChildGroups {
-			childGrp, err := g.networkPolicyController.gLister.Groups(s.Namespace).Get(string(groupname))
+			childGrp, err := g.networkPolicyController.grpLister.Groups(s.Namespace).Get(string(groupname))
 			if err != nil {
 				// the childGroup has not been created yet.
 				continue