Add Egress IPv6 test cases in dual-stack or pure IPv6 cluster. Related …

…antrea-io#2196 Fixed agent start fail nil panic in pure IPv6 cluster. Related antrea-io#2436 Signed-off-by: Wenqi Qiu <[email protected]>
wenqiq · Sep 1, 2021 · cfda4af · cfda4af
1 parent bfa1bc4
commit cfda4af
Show file tree

Hide file tree

Showing 8 changed files with 387 additions and 218 deletions.
diff --git a/cmd/antrea-agent/agent.go b/cmd/antrea-agent/agent.go
@@ -238,9 +238,17 @@ func run(o *Options) error {
 	}
 
 	var egressController *egress.EgressController
+	var nodeIP net.IP
+	if nodeConfig.NodeIPv4Addr != nil {
+		nodeIP = nodeConfig.NodeIPv4Addr.IP
+	} else if nodeConfig.NodeIPv6Addr != nil {
+		nodeIP = nodeConfig.NodeIPv6Addr.IP
+	} else {
+		return fmt.Errorf("invalid NodeIPAddr in Node config: %v", nodeConfig)
+	}
 	if features.DefaultFeatureGate.Enabled(features.Egress) {
 		egressController, err = egress.NewEgressController(
-			ofClient, antreaClientProvider, crdClient, ifaceStore, routeClient, nodeConfig.Name, nodeConfig.NodeIPv4Addr.IP,
+			ofClient, antreaClientProvider, crdClient, ifaceStore, routeClient, nodeConfig.Name, nodeIP,
 			o.config.ClusterMembershipPort, egressInformer, nodeInformer, externalIPPoolInformer,
 		)
 		if err != nil {

diff --git a/pkg/agent/memberlist/cluster.go b/pkg/agent/memberlist/cluster.go
@@ -257,13 +257,10 @@ func (c *Cluster) newClusterMember(node *corev1.Node) (string, error) {
 		return "", fmt.Errorf("obtain IP addresses from K8s Node failed: %v", err)
 	}
 	nodeAddr := nodeAddrs.IPv4
-	fmtStr := "%s:%d"
 	if nodeAddr == nil {
 		nodeAddr = nodeAddrs.IPv6
-		fmtStr = "[%s]:%d"
 	}
-	member := fmt.Sprintf(fmtStr, nodeAddr, c.bindPort)
-	return member, nil
+	return nodeAddr.String(), nil
 }
 
 func (c *Cluster) allClusterMembers() (clusterNodes []string, err error) {

diff --git a/pkg/agent/util/ndp/doc.go b/pkg/agent/util/ndp/doc.go
@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package ndp contains functions to send NDP advertisement on Linux.
+// Package ndp contains functions to send NDP neighbor advertisement on Linux.
 package ndp