Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IPv6][e2e] Fix testDeletePod #1193

Merged
merged 1 commit into from
Sep 3, 2020
Merged

Conversation

lzhecheng
Copy link
Contributor

On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.

@antrea-bot
Copy link
Collaborator

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).

@lzhecheng
Copy link
Contributor Author

/test-ipv6-e2e

@codecov-commenter
Copy link

codecov-commenter commented Sep 1, 2020

Codecov Report

Merging #1193 into ipv6 will increase coverage by 0.01%.
The diff coverage is 60.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             ipv6    #1193      +/-   ##
==========================================
+ Coverage   41.09%   41.10%   +0.01%     
==========================================
  Files          74       74              
  Lines       10805    10807       +2     
==========================================
+ Hits         4440     4442       +2     
  Misses       5999     5999              
  Partials      366      366              
Flag Coverage Δ
#unit-tests 41.10% <60.00%> (+0.01%) ⬆️

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

Impacted Files Coverage Δ
...g/agent/apiserver/handlers/podinterface/handler.go 70.73% <60.00%> (ø)
pkg/agent/querier/querier.go 65.90% <0.00%> (+0.79%) ⬆️

@@ -101,7 +101,7 @@ func (data *TestData) testDeletePod(t *testing.T, podName string, nodeName strin
t.Fatalf("Expected 1 pod interface, got %d", len(podInterfaces))
}
ifName := podInterfaces[0].InterfaceName
podIP := podInterfaces[0].IP
podIPs := strings.Split(strings.ReplaceAll(podInterfaces[0].IP, " ", ""), ",")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this temporary? Do we intend to update the Response struct so that it supports an array of IPs?
From:

type Response struct {
    // ...
    IP string
    // ...
}

To:

type Response struct {
    // ...
    IPs []string
    // ...
}

Or (for backwards-compatibility):

type Response struct {
    // ...
    IP string
    IPs []string
    // ...
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea. Let's pick the first one.

@@ -101,7 +101,7 @@ func (data *TestData) testDeletePod(t *testing.T, podName string, nodeName strin
t.Fatalf("Expected 1 pod interface, got %d", len(podInterfaces))
}
ifName := podInterfaces[0].InterfaceName
podIP := podInterfaces[0].IP
podIPs := strings.Split(strings.ReplaceAll(podInterfaces[0].IP, " ", ""), ",")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: you could use the following here since the separator in Split can be a string:

podIPs := strings.Split(podInterfaces[0].IP, ", ")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@lzhecheng lzhecheng force-pushed the ipv6-e2e branch 4 times, most recently from 0c480ba to 7e1df55 Compare September 2, 2020 09:08
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

PodName string `json:"name,omitempty" antctl:"name,Name of the Pod"`
PodNamespace string `json:"podNamespace,omitempty"`
InterfaceName string `json:"interfaceName,omitempty"`
IPs []string `json:"ips,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jianjuns @tnqn any concern about breaking backward-compatibility for that API? No concern on my side since this is an API which is local to the Agent and AFAIK only consumed by antctl.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is fine.
But maybe we should think about our API versioning strategy sometime.

@lzhecheng
Copy link
Contributor Author

/test-ipv6-conformance

@lzhecheng
Copy link
Contributor Author

/test-networkpolicy

@lzhecheng
Copy link
Contributor Author

/test-conformance

@lzhecheng
Copy link
Contributor Author

/test-e2e

@lzhecheng
Copy link
Contributor Author

/test-hw-offload
/test-ipv6-e2e
/test-windows-conformance
/test-windows-networkpolicy

@lzhecheng
Copy link
Contributor Author

/test-e2e
/test-conformance

@lzhecheng lzhecheng merged commit 488f5f2 into antrea-io:ipv6 Sep 3, 2020
@lzhecheng lzhecheng deleted the ipv6-e2e branch September 3, 2020 09:45
wenyingd pushed a commit that referenced this pull request Sep 7, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit that referenced this pull request Sep 15, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit that referenced this pull request Sep 17, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit that referenced this pull request Sep 21, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit to wenyingd/antrea that referenced this pull request Sep 24, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit that referenced this pull request Sep 25, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit that referenced this pull request Sep 29, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit that referenced this pull request Oct 12, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit to wenyingd/antrea that referenced this pull request Oct 19, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit that referenced this pull request Oct 26, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit to wenyingd/antrea that referenced this pull request Oct 27, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
wenyingd pushed a commit to wenyingd/antrea that referenced this pull request Oct 31, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit to lzhecheng/antrea that referenced this pull request Nov 2, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit to lzhecheng/antrea that referenced this pull request Nov 2, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit to lzhecheng/antrea that referenced this pull request Nov 3, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit to lzhecheng/antrea that referenced this pull request Nov 3, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit to lzhecheng/antrea that referenced this pull request Nov 3, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit to lzhecheng/antrea that referenced this pull request Nov 3, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit to lzhecheng/antrea that referenced this pull request Nov 5, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit to lzhecheng/antrea that referenced this pull request Nov 5, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit that referenced this pull request Nov 9, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit that referenced this pull request Nov 9, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit that referenced this pull request Nov 10, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit that referenced this pull request Nov 11, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit that referenced this pull request Nov 11, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit that referenced this pull request Nov 11, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit that referenced this pull request Nov 11, 2020
On a dual-stack cluster, podInterfaces[0].IP returns "[ipv4-address], [ipv6-address]".
Current implementation doesn't distingush two.
lzhecheng added a commit that referenced this pull request Nov 11, 2020
* 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants