Address comments

Signed-off-by: Wenqi Qiu <wenqiq@vmware.com>

pkg/agent/controller/noderoute/node_route_controller.go

@@ -765,7 +765,7 @@ func getNodeMAC(node *corev1.Node) (net.HardwareAddr, error) {
 
 func (c *Controller) getNodeTransportAddrs(node *corev1.Node) (*utilip.DualStackIPs, error) {
 	if c.networkConfig.TransportIface != "" || len(c.networkConfig.TransportIfaceCIDRs) > 0 {
-		transportAddrs, err := k8s.GetNodeAddressFromAnnotations(node, types.NodeTransportAddressAnnotationKey)
+		transportAddrs, err := k8s.GetNodeAddrsFromAnnotations(node, types.NodeTransportAddressAnnotationKey)
 		if err != nil {
 			return nil, err
 		}

pkg/antctl/command_definition_test.go

@@ -219,9 +219,9 @@ foo2
 					Pods: []common.GroupMember{},
 				},
 			},
-			expected: `NAME       POD/NODE-IPS                                      
-GroupName1 10.0.0.3,127.0.0.1,127.0.0.2,127.0.0.3 + 2 more...
-GroupName2 <NONE>                                            
+			expected: `NAME       POD-IPS                                            NODE-IPS
+GroupName1 10.0.0.3,127.0.0.1,127.0.0.2,127.0.0.3 + 2 more... <NONE>  
+GroupName2 <NONE>                                             <NONE>  
 `,
 		},
 		{
@@ -245,10 +245,10 @@ GroupName2 <NONE>
 					Pods: []common.GroupMember{},
 				},
 			},
-			expected: `NAME                     POD/NODE-IPS                                      
-AddressGroupNameHasNode  10.176.27.105,127.0.0.1,127.0.0.3,192.168.0.1     
-AddressGroupNameHasNode1 10.0.0.3,127.0.0.1,127.0.0.2,127.0.0.3 + 2 more...
-AddressGroupNameHasNode2 <NONE>                                            
+			expected: `NAME                     POD-IPS                                            NODE-IPS                                     
+AddressGroupNameHasNode  <NONE>                                             10.176.27.105,127.0.0.1,127.0.0.3,192.168.0.1
+AddressGroupNameHasNode1 10.0.0.3,127.0.0.1,127.0.0.2,127.0.0.3 + 2 more... <NONE>                                       
+AddressGroupNameHasNode2 <NONE>                                             <NONE>                                       
 `,
 		},
 		{

pkg/antctl/transform/addressgroup/transform.go

@@ -42,13 +42,15 @@ func listTransform(l interface{}, opts map[string]string) (interface{}, error) {
 
 func objectTransform(o interface{}, _ map[string]string) (interface{}, error) {
 	group := o.(*cpv1beta.AddressGroup)
-	var pods, nodes []common.GroupMember
-	for _, member := range group.GroupMembers {
-		if member.Node != "" {
-			nodes = append(nodes, common.GroupMemberPodTransform(member))
+	// var pods, nodes []common.GroupMember
+	pods := make([]common.GroupMember, len(group.GroupMembers))
+	nodes := make([]common.GroupMember, len(group.GroupMembers))
+	for i, member := range group.GroupMembers {
+		if member.Node != nil {
+			nodes[i] = common.GroupMemberPodOrNodeTransform(member)
 			continue
 		}
-		pods = append(pods, common.GroupMemberPodTransform(member))
+		pods[i] = common.GroupMemberPodOrNodeTransform(member)
 	}
 	return Response{Name: group.Name, Pods: pods, Nodes: nodes}, nil
 }
@@ -66,7 +68,7 @@ func Transform(reader io.Reader, single bool, opts map[string]string) (interface
 var _ common.TableOutput = new(Response)
 
 func (r Response) GetTableHeader() []string {
-	return []string{"NAME", "POD/NODE-IPS"}
+	return []string{"NAME", "POD-IPS", "NODE-IPS"}
 }
 
 func (r Response) GetPodIPs(maxColumnLength int) string {
@@ -86,10 +88,7 @@ func (r Response) GetNodeIPs(maxColumnLength int) string {
 }
 
 func (r Response) GetTableRow(maxColumnLength int) []string {
-	if len(r.Pods) > 0 {
-		return []string{r.Name, r.GetPodIPs(maxColumnLength)}
-	}
-	return []string{r.Name, r.GetNodeIPs(maxColumnLength)}
+	return []string{r.Name, r.GetPodIPs(maxColumnLength), r.GetNodeIPs(maxColumnLength)}
 }
 
 func (r Response) SortRows() bool {

pkg/antctl/transform/appliedtogroup/transform.go

@@ -43,7 +43,7 @@ func objectTransform(o interface{}, _ map[string]string) (interface{}, error) {
 	group := o.(*cpv1beta.AppliedToGroup)
 	var pods []common.GroupMember
 	for _, pod := range group.GroupMembers {
-		pods = append(pods, common.GroupMemberPodTransform(pod))
+		pods = append(pods, common.GroupMemberPodOrNodeTransform(pod))
 	}
 	return Response{Name: group.GetName(), Pods: pods}, nil
 }

pkg/antctl/transform/common/transform.go

@@ -24,15 +24,15 @@ import (
 )
 
 type GroupMember struct {
-	Pod  *cpv1beta.PodReference `json:"pod,omitempty"`
-	Node string                 `json:"node,omitempty"`
+	Pod  *cpv1beta.PodReference  `json:"pod,omitempty"`
+	Node *cpv1beta.NodeReference `json:"node,omitempty"`
 	// IP maintains the IPAddresses associated with the Pod.
 	IP string `json:"ip,omitempty"`
 	// Ports maintain the named port mapping of this Pod.
 	Ports []cpv1beta.NamedPort `json:"ports,omitempty"`
 }
 
-func GroupMemberPodTransform(member cpv1beta.GroupMember) GroupMember {
+func GroupMemberPodOrNodeTransform(member cpv1beta.GroupMember) GroupMember {
 	var ipStr string
 	for i, ip := range member.IPs {
 		if i != 0 {

pkg/apis/controlplane/types.go

@@ -44,6 +44,12 @@ type PodReference struct {
 	Namespace string
 }
 
+// NodeReference represents a Node Reference.
+type NodeReference struct {
+	// The name of this Node.
+	Name string
+}
+
 // ServiceReference represents reference to a v1.Service.
 type ServiceReference struct {
 	// The name of this Service.
@@ -77,7 +83,7 @@ type GroupMember struct {
 	// ExternalEntity maintains the reference to the ExternalEntity.
 	ExternalEntity *ExternalEntityReference
 	// Node maintains the reference to the Node.
-	Node string
+	Node *NodeReference
 	// IP is the IP address of the Endpoints associated with the GroupMember.
 	IPs []IPAddress
 	// Ports is the list NamedPort of the GroupMember.