[IPv6] Handle dual stack NodeSubnet for monitoring CRD #1182

mengdie-song · 2020-08-31T04:46:23Z

To avoid duplicate CIDRs, this patch makes a new string slice for dual stack
node subnet instead of appending agentInfo.NodeSubnet directly.

antrea-bot · 2020-08-31T04:46:34Z

Thanks for your PR.
Unit tests and code linters are run automatically every time the PR is updated.
E2e, conformance and network policy tests can only be triggered by a member of the vmware-tanzu organization. Regular contributors to the project should join the org.

The following commands are available:

/test-e2e: to trigger e2e tests.
/skip-e2e: to skip e2e tests.
/test-conformance: to trigger conformance tests.
/skip-conformance: to skip conformance tests.
/test-whole-conformance: to trigger all conformance tests on linux.
/skip-whole-conformance: to skip all conformance tests on linux.
/test-networkpolicy: to trigger networkpolicy tests.
/skip-networkpolicy: to skip networkpolicy tests.
/test-windows-conformance: to trigger windows conformance tests.
/skip-windows-conformance: to skip windows conformance tests.
/test-windows-networkpolicy: to trigger windows networkpolicy tests.
/skip-windows-networkpolicy: to skip windows networkpolicy tests.
/test-hw-offload: to trigger ovs hardware offload test.
/skip-hw-offload: to skip ovs hardware offload test.
/test-all: to trigger all tests (except whole conformance).
/skip-all: to skip all tests (except whole conformance).

mengdie-song · 2020-08-31T08:51:44Z

/test-all

codecov-commenter · 2020-08-31T08:55:16Z

Codecov Report

Merging #1182 into ipv6 will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             ipv6    #1182      +/-   ##
==========================================
+ Coverage   41.09%   41.10%   +0.01%     
==========================================
  Files          74       74              
  Lines       10805    10807       +2     
==========================================
+ Hits         4440     4442       +2     
- Misses       5999     6000       +1     
+ Partials      366      365       -1

Flag	Coverage Δ
#unit-tests	`41.10% <100.00%> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
pkg/agent/querier/querier.go	`65.90% <100.00%> (+0.79%)`	⬆️
pkg/apiserver/storage/ram/watch.go	`85.71% <0.00%> (-3.18%)`	⬇️
pkg/apiserver/storage/ram/store.go	`81.69% <0.00%> (+1.30%)`	⬆️

tnqn

LGTM

wenyingd · 2020-09-01T07:12:11Z

pkg/agent/querier/querier.go

@@ -193,12 +193,15 @@ func (aq agentQuerier) GetAgentInfo(agentInfo *v1beta1.AntreaAgentInfo, partial
 		agentInfo.Version = querier.GetVersion()
 		agentInfo.PodRef = querier.GetSelfPod()
 		agentInfo.NodeRef = querier.GetSelfNode(true, aq.nodeConfig.Name)
+		// Make a new string slice instead of appending agentInfo.NodeSubnet directly to avoid duplicate CIDRs.
+		nodeSubnet := make([]string, 0)


rename it as nodeSubnets?

I use nodeSubnet here to make it consistent with CRD field NodeSubnet. But it may be better to change both of them to NodeSubnets as we support dual stack now. Let me try to update this part.

wenyingd · 2020-09-01T07:12:31Z

pkg/agent/querier/querier.go

@@ -193,12 +193,15 @@ func (aq agentQuerier) GetAgentInfo(agentInfo *v1beta1.AntreaAgentInfo, partial
 		agentInfo.Version = querier.GetVersion()
 		agentInfo.PodRef = querier.GetSelfPod()
 		agentInfo.NodeRef = querier.GetSelfNode(true, aq.nodeConfig.Name)
+		// Make a new string slice instead of appending agentInfo.NodeSubnet directly to avoid duplicate CIDRs.


Why does it cause duplicate CIDRs?

In the case of restarting Agent, according to current monitoring handling workflow, we will update the entire CRD (https://github.com/vmware-tanzu/antrea/blob/master/pkg/monitor/agent.go#L79). But monitor.agentCRD is not nil and is likely to have nodeSubnet (https://github.com/vmware-tanzu/antrea/blob/master/pkg/monitor/agent.go#L62), to avoid duplicate subnet, we need to initialize a new slice for nodeSubnet every time we need to update the entire CRD.

In the case of restarting Agent, according to current monitoring handling workflow, we will update the entire CRD (https://github.com/vmware-tanzu/antrea/blob/master/pkg/monitor/agent.go#L79). But monitor.agentCRD is not nil and is likely to have nodeSubnet (https://github.com/vmware-tanzu/antrea/blob/master/pkg/monitor/agent.go#L62), to avoid duplicate subnet, we need to initialize a new slice for nodeSubnet every time we need to update the entire CRD.

Got it, thanks for clarifying.

mengdie-song · 2020-09-01T10:09:55Z

/test-all

1. Rename NodeSubnet to NodeSubnets for AntreaAgentInfo. 2. Make a new string slice for dual stack node subnet instead of appending agentInfo.NodeSubnets directly to avoid duplicate CIDRs.

mengdie-song · 2020-09-02T03:14:39Z

/test-all

mengdie-song · 2020-09-02T04:11:27Z

/test-windows-conformance

1. Rename NodeSubnet to NodeSubnets for AntreaAgentInfo. 2. Make a new string slice for dual stack node subnet instead of appending agentInfo.NodeSubnets directly to avoid duplicate CIDRs.

* Enable verbose logging through generate-manifest.sh (#1142) This patch enables verbose logging for antrea-agent and antrea-controller when generate manifest. This will help in troubleshooting with increased log level. * Bug in PR#1142 (#1248) manifest generation failing in release mode. Fixed the bug. * [IPv6] Consume Node.Spec.CIDRs to support dual-stack configuration (#971) 1. Consume Node.Spec.CIDRs to support IPv4/IPv6 dual-stack Pod Subnets 2. Change NodeConfig.PodCIDR as a slice 3. Change GatewayConfig.IP as a slice to support multiple addresses for antrea-gw0 4. Change InterfaceConfig.IP as a slice to support multiple address for a Pod * [IPv6] Change openflow pipeline for L2 Pod networking (#1040) 1. Add a new table named IPv6 to handle IPv6 ND Solicitation, ND advertisement and IPv6 Multicast traffic. 2. Add flows in openflow tables (spoofGuardTable, IPv6, conntrackTable, conntrackStateTable, conntrackCommitTable, L2ForwardingOutTable) for handling IPv6 L2 Pod networking. * [IPv6] Change host-local IPAM configuration for IPv6 (#1039) 1. Add new field Ranges in IPAMConfig for allocating both IPv4 and IPv6 addresses. 2. Populate subnet and gateway for both IPv4 range and IPv6 range. * [IPv6] Use separate fields for IPv4 and IPv6 in GatewayConfig (#1111) Replace IP slice in GatewayConfig with separate IPv4 and IPv6 fields. * [IPv6] Implement L3 connectivity for IPv6 traffic (#1011) 1. Use IPv6 in iptables and ipset configuration. 2. Identifiy IPv6 address and configure in OpenFlow. 3. Use Node Internal address for tunnel. * [IPv6] Handle Spec.PodCIDR with IPv6 CIDR (#1151) For IPv6 single stack case, node.Spec.PodCIDR is configured with IPv6 CIDR. This patch handles the case and sets nodeConfig.PodIPv6CIDR with parsed CIDR. * [IPv6] Add support for IPv6 address in antctl and agent's apiserver (#1118) * [IPv6] Add support for IPv6 address in antctl and agent's apiserver 1. Support using IPv6 address in OVS tracing. 2. Support displaying Node's and Pod's IPv6 address in agent apiserver. Co-authored-by: Zhecheng Li <[email protected]> * [IPv6] Support IPv6 in e2e (#1129) * [IPv6] Display dual stack NodeSubnet in antrea-octant-plugin (#1156) NodeSubnet can have two values in dual stack case and this patch enhances octant-plugin to show both subnets. * [IPv6] Handle dual stack NodeSubnet for monitoring CRD (#1182) 1. Rename NodeSubnet to NodeSubnets for AntreaAgentInfo. 2. Make a new string slice for dual stack node subnet instead of appending agentInfo.NodeSubnets directly to avoid duplicate CIDRs. * [IPv6][e2e] Fix testDeletePod (#1193) On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]". Current implementation doesn't distingush two. * [IPv6] Collect service CIDR in e2e * [IPv6] Add support for dual-stack when using kube-proxy for Service (#1200) 1. Add a config item for IPv6 Serivce CIDR if using kube-proxy to provide Service functions. 2. Output IPv6 traffic from host gateway if its destination is a Service address. 3. Use ct_mark to identify Service traffic and output the reply packet to the host gateway to ensure the DNAT processing in iptables. * [IPv6] Extend e2e tests for dual-stack (#1192) 1. Extend generic functions "podWaitForIP" to return all assigned IPs of a given Pod. 2. Validate each IP address in the cluster's network CIDR 3. Use each valid IP to check connectivity. 4. Use each valid IP to execute tests. * [IPv6] E2e bug fixes (#1311) 1. No -6 option in busybox nc So, no need to distinguish if it is an IPv6 environment for runNetcatCommandFromTestPod() nc BusyBox v1.31.1 (2019-10-28 18:40:01 UTC) multi-call binary. Usage: nc [OPTIONS] HOST PORT - connect nc [OPTIONS] -l -p PORT [HOST] [PORT] - listen -e PROG Run PROG after connect (must be last) -l Listen mode, for inbound connects -lk With -e, provides persistent server -p PORT Local port -s ADDR Local address -w SEC Timeout for connects and final net reads -i SEC Delay interval for lines sent -n Don't do DNS resolution -u UDP mode -v Verbose -o FILE Hex dump traffic -z Zero-I/O mode (scanning) 2. testCert * IPv6 address should be in "[]" * [IPv6] Fix TestReconcileGatewayRoutesOnStartup failure (#1313) Use "ip -6 route" for IPv6 network. * [IPv6] adjust MTU for IPv6 overhead (#1305) If Antrea MTU is too large in IPv6 environment, large packet with overhead exceeds node MTU cannot be transmitted successfully across nodes. IPv6ExtraOverhead, 20 is from observation of IPv4 and IPv6 packets under same situation. * [IPv6] Fix MTU config (#1317) Use Node's internal address to decide if extra IPv6 overhead is needed. * [IPv6] Skip IPsec e2e test (#1373) * With OVS v2.14.0, IPsec in IPv6 envinronment is not supported. * More user-friendly output for PodIPs. From: Retrieved all Pod IPs: map[test-pod-0-upgp1ung:0xc000708960 test-pod-1-pbva9007:0xc0006ec8a0] To: Retrieved all Pod IPs: map[test-pod-0-mudzj847:IPv6: fd74:ca9b:172:16::4, IP strings: fd74:ca9b:172:16::4 test-pod-1-apcmyd30:IPv6: fd74:ca9b:172:16:1::3c, IP strings: fd74:ca9b:172:16:1::3c] * [IPv6] Add 2 Network Policy tests (#1399) 2 upstream Network Policy tests didn't consider netmask for IPv6, this patch is to add correct tests. When bug is fixed in latest release, these 2 tests can be deleted. Kubernetes PR: kubernetes/kubernetes#93583 2 testcases: https://github.com/kubernetes/kubernetes/blob/v1.20.0-alpha.0/test/e2e/network/network_policy.go#L1365 https://github.com/kubernetes/kubernetes/blob/v1.20.0-alpha.0/test/e2e/network/network_policy.go#L1444 * Skip 2 Network Policy testcases before Network Policy IPv6 is supported (#1460) * [IPv6] Fix after rebasing * format code * fix TestPodTrafficShaping * fix TestIPv6RoutesAndNeighbors * [IPv6] Fix issues (#1496) * unit test * manifest * [IPv6] Skip TestAntctlProxy for IPv6 (#1498) * [IPv6] Add IPv6 support for NetworkPolicy 1. Add enhancement in Antrea Controller and Agent to support NetworkPolicy in IPv6. 2. Optimize test cases to support IPv6 3. Use regex in CRD to validate IPv4 or IPv6 string 4. Add TestEgressToServerInCIDRBlock and TestEgressToServerInCIDRBlockWithException 5. networkpolicy_controller.go: PodIPs includes PodIP * [IPv6] Fix issues * remove Github Actions integration test, Jenkins: jenkins-integration -> Integration tests * go fmt * add FlowProtocl() to interface Flow * remove extra lines when rebasing for an octant commit * TestIPv6RoutesAndNeighbors: routeClient.Initialize Co-authored-by: srikartati <[email protected]> Co-authored-by: Wenying Dong <[email protected]> Co-authored-by: Mengdie Song <[email protected]> Co-authored-by: Zhecheng Li <[email protected]>

vmwclabot added the cla-not-required label Aug 31, 2020

wenyingd force-pushed the ipv6 branch from f7cffac to e34fd89 Compare August 31, 2020 08:13

mengdie-song force-pushed the ipv6-monitorCRD branch from 4b578a2 to d1b941c Compare August 31, 2020 08:50

wenyingd mentioned this pull request Aug 31, 2020

IPv6 support - including dual stack #136

Closed

mengdie-song requested review from wenyingd, tnqn and jianjuns September 1, 2020 05:43

tnqn approved these changes Sep 1, 2020

View reviewed changes

wenyingd reviewed Sep 1, 2020

View reviewed changes

mengdie-song force-pushed the ipv6-monitorCRD branch from d1b941c to 45b3b47 Compare September 1, 2020 10:07

mengdie-song force-pushed the ipv6-monitorCRD branch from 45b3b47 to 3c7a3eb Compare September 1, 2020 10:23

[IPv6] Handle dual stack NodeSubnet for monitoring CRD

3c7a3eb

1. Rename NodeSubnet to NodeSubnets for AntreaAgentInfo. 2. Make a new string slice for dual stack node subnet instead of appending agentInfo.NodeSubnets directly to avoid duplicate CIDRs.

wenyingd approved these changes Sep 2, 2020

View reviewed changes

mengdie-song merged commit 20c0dbe into antrea-io:ipv6 Sep 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[IPv6] Handle dual stack NodeSubnet for monitoring CRD #1182

[IPv6] Handle dual stack NodeSubnet for monitoring CRD #1182

mengdie-song commented Aug 31, 2020

antrea-bot commented Aug 31, 2020

mengdie-song commented Aug 31, 2020

codecov-commenter commented Aug 31, 2020 •

edited

Loading

tnqn left a comment

wenyingd Sep 1, 2020

mengdie-song Sep 1, 2020

mengdie-song Sep 1, 2020

wenyingd Sep 1, 2020

mengdie-song Sep 1, 2020

wenyingd Sep 2, 2020

mengdie-song commented Sep 1, 2020

mengdie-song commented Sep 2, 2020

mengdie-song commented Sep 2, 2020

[IPv6] Handle dual stack NodeSubnet for monitoring CRD #1182

[IPv6] Handle dual stack NodeSubnet for monitoring CRD #1182

Conversation

mengdie-song commented Aug 31, 2020

antrea-bot commented Aug 31, 2020

mengdie-song commented Aug 31, 2020

codecov-commenter commented Aug 31, 2020 • edited Loading

Codecov Report

tnqn left a comment

Choose a reason for hiding this comment

wenyingd Sep 1, 2020

Choose a reason for hiding this comment

mengdie-song Sep 1, 2020

Choose a reason for hiding this comment

mengdie-song Sep 1, 2020

Choose a reason for hiding this comment

wenyingd Sep 1, 2020

Choose a reason for hiding this comment

mengdie-song Sep 1, 2020

Choose a reason for hiding this comment

wenyingd Sep 2, 2020

Choose a reason for hiding this comment

mengdie-song commented Sep 1, 2020

mengdie-song commented Sep 2, 2020

mengdie-song commented Sep 2, 2020

codecov-commenter commented Aug 31, 2020 •

edited

Loading