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] Merge IPv6 branch to master #1518

Merged
merged 28 commits into from
Nov 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d365b5f
Enable verbose logging through generate-manifest.sh (#1142)
srikartati Sep 14, 2020
301814f
Bug in PR#1142 (#1248)
srikartati Sep 14, 2020
a9a646c
[IPv6] Consume Node.Spec.CIDRs to support dual-stack configuration (#…
wenyingd Aug 7, 2020
b004976
[IPv6] Change openflow pipeline for L2 Pod networking (#1040)
mengdie-song Aug 12, 2020
5183f5c
[IPv6] Change host-local IPAM configuration for IPv6 (#1039)
mengdie-song Aug 19, 2020
4a62c45
[IPv6] Use separate fields for IPv4 and IPv6 in GatewayConfig (#1111)
mengdie-song Aug 21, 2020
a926dde
[IPv6] Implement L3 connectivity for IPv6 traffic (#1011)
wenyingd Aug 27, 2020
1468e91
[IPv6] Handle Spec.PodCIDR with IPv6 CIDR (#1151)
mengdie-song Aug 27, 2020
2f96a0b
[IPv6] Add support for IPv6 address in antctl and agent's apiserver (…
wenyingd Aug 28, 2020
210a8f3
[IPv6] Support IPv6 in e2e (#1129)
lzhecheng Aug 28, 2020
000fe89
[IPv6] Display dual stack NodeSubnet in antrea-octant-plugin (#1156)
mengdie-song Aug 28, 2020
295f952
[IPv6] Handle dual stack NodeSubnet for monitoring CRD (#1182)
mengdie-song Sep 2, 2020
39f2b71
[IPv6][e2e] Fix testDeletePod (#1193)
lzhecheng Sep 3, 2020
48f8eaf
[IPv6] Collect service CIDR in e2e
lzhecheng Sep 9, 2020
ff93d80
[IPv6] Add support for dual-stack when using kube-proxy for Service (…
wenyingd Sep 16, 2020
e70edd6
[IPv6] Extend e2e tests for dual-stack (#1192)
wenyingd Sep 18, 2020
3eb7a2d
[IPv6] E2e bug fixes (#1311)
lzhecheng Sep 28, 2020
c4de3a2
[IPv6] Fix TestReconcileGatewayRoutesOnStartup failure (#1313)
lzhecheng Sep 29, 2020
ab4ce42
[IPv6] adjust MTU for IPv6 overhead (#1305)
lzhecheng Sep 29, 2020
50cf482
[IPv6] Fix MTU config (#1317)
lzhecheng Sep 29, 2020
909035f
[IPv6] Skip IPsec e2e test (#1373)
lzhecheng Oct 15, 2020
905402a
[IPv6] Add 2 Network Policy tests (#1399)
lzhecheng Oct 20, 2020
41a0abc
Skip 2 Network Policy testcases before Network Policy IPv6 is support…
lzhecheng Oct 30, 2020
b265cb6
[IPv6] Fix after rebasing
lzhecheng Nov 5, 2020
5f6512d
[IPv6] Fix issues (#1496)
lzhecheng Nov 5, 2020
a31a432
[IPv6] Skip TestAntctlProxy for IPv6 (#1498)
lzhecheng Nov 5, 2020
3c5cdcf
[IPv6] Add IPv6 support for NetworkPolicy
wenyingd Oct 22, 2020
267d1c0
[IPv6] Fix issues
lzhecheng Nov 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .github/workflows/integration.yml

This file was deleted.

1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ docker-test-integration: .coverage
-v $(DOCKER_CACHE)/gocache:/tmp/gocache \
-v $(CURDIR)/.coverage:/usr/src/github.com/vmware-tanzu/antrea/.coverage \
-v $(CURDIR):/usr/src/github.com/vmware-tanzu/antrea:ro \
-v /lib/modules:/lib/modules \
antrea/test test-integration $(USERID) $(GRPID)

.PHONY: docker-tidy
Expand Down
21 changes: 14 additions & 7 deletions build/yamls/antrea-aks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
items:
properties:
ip:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
name:
type: string
Expand Down Expand Up @@ -485,7 +485,7 @@ spec:
- ip
properties:
ip:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
namespace:
type: string
Expand All @@ -503,7 +503,7 @@ spec:
protocol:
type: integer
srcIP:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
ttl:
type: integer
Expand Down Expand Up @@ -1056,7 +1056,8 @@ data:
featureGates:
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
# Service traffic.
# Service traffic. Antrea proxy doesn't support an IPv6 only cluster or a Dual-Stack cluster
# before PR #1102[https://github.com/vmware-tanzu/antrea/pull/1102] is merged.
AntreaProxy: true

# Enable traceflow which provides packet tracing feature to diagnose network issue.
Expand Down Expand Up @@ -1124,6 +1125,12 @@ data:
# for the GRE tunnel type.
#enableIPSecTunnel: false

# ClusterIP CIDR range for IPv6 Services. It's required when using kube-proxy to provide IPv6 Service in a Dual-Stack
# cluster or an IPv6 only cluster. The value should be the same as the configuration for kube-apiserver specified by
# --service-cluster-ip-range. When AntreaProxy is enabled, this parameter is not needed.
# No default value for this field.
#serviceCIDRv6:

# The port for the antrea-agent APIServer to serve on.
# Note that if it's set to another value, the `containerPort` of the `api` port of the
# `antrea-agent` container must be set to the same value.
Expand Down Expand Up @@ -1202,7 +1209,7 @@ metadata:
annotations: {}
labels:
app: antrea
name: antrea-config-2fm49f65tg
name: antrea-config-hmttgfbf78
namespace: kube-system
---
apiVersion: v1
Expand Down Expand Up @@ -1309,7 +1316,7 @@ spec:
key: node-role.kubernetes.io/master
volumes:
- configMap:
name: antrea-config-2fm49f65tg
name: antrea-config-hmttgfbf78
name: antrea-config
- name: antrea-controller-tls
secret:
Expand Down Expand Up @@ -1573,7 +1580,7 @@ spec:
operator: Exists
volumes:
- configMap:
name: antrea-config-2fm49f65tg
name: antrea-config-hmttgfbf78
name: antrea-config
- hostPath:
path: /etc/cni/net.d
Expand Down
21 changes: 14 additions & 7 deletions build/yamls/antrea-eks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
items:
properties:
ip:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
name:
type: string
Expand Down Expand Up @@ -485,7 +485,7 @@ spec:
- ip
properties:
ip:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
namespace:
type: string
Expand All @@ -503,7 +503,7 @@ spec:
protocol:
type: integer
srcIP:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
ttl:
type: integer
Expand Down Expand Up @@ -1056,7 +1056,8 @@ data:
featureGates:
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
# Service traffic.
# Service traffic. Antrea proxy doesn't support an IPv6 only cluster or a Dual-Stack cluster
# before PR #1102[https://github.com/vmware-tanzu/antrea/pull/1102] is merged.
AntreaProxy: true
# Enable traceflow which provides packet tracing feature to diagnose network issue.
Expand Down Expand Up @@ -1124,6 +1125,12 @@ data:
# for the GRE tunnel type.
#enableIPSecTunnel: false
# ClusterIP CIDR range for IPv6 Services. It's required when using kube-proxy to provide IPv6 Service in a Dual-Stack
# cluster or an IPv6 only cluster. The value should be the same as the configuration for kube-apiserver specified by
# --service-cluster-ip-range. When AntreaProxy is enabled, this parameter is not needed.
# No default value for this field.
#serviceCIDRv6:
# The port for the antrea-agent APIServer to serve on.
# Note that if it's set to another value, the `containerPort` of the `api` port of the
# `antrea-agent` container must be set to the same value.
Expand Down Expand Up @@ -1202,7 +1209,7 @@ metadata:
annotations: {}
labels:
app: antrea
name: antrea-config-2fm49f65tg
name: antrea-config-hmttgfbf78
namespace: kube-system
---
apiVersion: v1
Expand Down Expand Up @@ -1309,7 +1316,7 @@ spec:
key: node-role.kubernetes.io/master
volumes:
- configMap:
name: antrea-config-2fm49f65tg
name: antrea-config-hmttgfbf78
name: antrea-config
- name: antrea-controller-tls
secret:
Expand Down Expand Up @@ -1575,7 +1582,7 @@ spec:
operator: Exists
volumes:
- configMap:
name: antrea-config-2fm49f65tg
name: antrea-config-hmttgfbf78
name: antrea-config
- hostPath:
path: /etc/cni/net.d
Expand Down
21 changes: 14 additions & 7 deletions build/yamls/antrea-gke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
items:
properties:
ip:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
name:
type: string
Expand Down Expand Up @@ -485,7 +485,7 @@ spec:
- ip
properties:
ip:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
namespace:
type: string
Expand All @@ -503,7 +503,7 @@ spec:
protocol:
type: integer
srcIP:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
ttl:
type: integer
Expand Down Expand Up @@ -1056,7 +1056,8 @@ data:
featureGates:
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
# Service traffic.
# Service traffic. Antrea proxy doesn't support an IPv6 only cluster or a Dual-Stack cluster
# before PR #1102[https://github.com/vmware-tanzu/antrea/pull/1102] is merged.
AntreaProxy: true

# Enable traceflow which provides packet tracing feature to diagnose network issue.
Expand Down Expand Up @@ -1124,6 +1125,12 @@ data:
# for the GRE tunnel type.
#enableIPSecTunnel: false

# ClusterIP CIDR range for IPv6 Services. It's required when using kube-proxy to provide IPv6 Service in a Dual-Stack
# cluster or an IPv6 only cluster. The value should be the same as the configuration for kube-apiserver specified by
# --service-cluster-ip-range. When AntreaProxy is enabled, this parameter is not needed.
# No default value for this field.
#serviceCIDRv6:

# The port for the antrea-agent APIServer to serve on.
# Note that if it's set to another value, the `containerPort` of the `api` port of the
# `antrea-agent` container must be set to the same value.
Expand Down Expand Up @@ -1202,7 +1209,7 @@ metadata:
annotations: {}
labels:
app: antrea
name: antrea-config-m742b78ct4
name: antrea-config-8bc4m9g22g
namespace: kube-system
---
apiVersion: v1
Expand Down Expand Up @@ -1309,7 +1316,7 @@ spec:
key: node-role.kubernetes.io/master
volumes:
- configMap:
name: antrea-config-m742b78ct4
name: antrea-config-8bc4m9g22g
name: antrea-config
- name: antrea-controller-tls
secret:
Expand Down Expand Up @@ -1573,7 +1580,7 @@ spec:
operator: Exists
volumes:
- configMap:
name: antrea-config-m742b78ct4
name: antrea-config-8bc4m9g22g
name: antrea-config
- hostPath:
path: /etc/cni/net.d
Expand Down
21 changes: 14 additions & 7 deletions build/yamls/antrea-ipsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
items:
properties:
ip:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
name:
type: string
Expand Down Expand Up @@ -485,7 +485,7 @@ spec:
- ip
properties:
ip:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
namespace:
type: string
Expand All @@ -503,7 +503,7 @@ spec:
protocol:
type: integer
srcIP:
format: ipv4
pattern: ^(((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5]))|([\da-fA-F]{1,4}(\:[\da-fA-F]{1,4}){7})|(([\da-fA-F]{1,4}:){0,5}::([\da-fA-F]{1,4}:){0,5}[\da-fA-F]{1,4})$
type: string
ttl:
type: integer
Expand Down Expand Up @@ -1056,7 +1056,8 @@ data:
featureGates:
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
# Service traffic.
# Service traffic. Antrea proxy doesn't support an IPv6 only cluster or a Dual-Stack cluster
# before PR #1102[https://github.com/vmware-tanzu/antrea/pull/1102] is merged.
# AntreaProxy: false
# Enable traceflow which provides packet tracing feature to diagnose network issue.
Expand Down Expand Up @@ -1129,6 +1130,12 @@ data:
# AntreaProxy is enabled, this parameter is not needed and will be ignored if provided.
#serviceCIDR: 10.96.0.0/12
# ClusterIP CIDR range for IPv6 Services. It's required when using kube-proxy to provide IPv6 Service in a Dual-Stack
# cluster or an IPv6 only cluster. The value should be the same as the configuration for kube-apiserver specified by
# --service-cluster-ip-range. When AntreaProxy is enabled, this parameter is not needed.
# No default value for this field.
#serviceCIDRv6:
# The port for the antrea-agent APIServer to serve on.
# Note that if it's set to another value, the `containerPort` of the `api` port of the
# `antrea-agent` container must be set to the same value.
Expand Down Expand Up @@ -1207,7 +1214,7 @@ metadata:
annotations: {}
labels:
app: antrea
name: antrea-config-2gdh849dhk
name: antrea-config-kgd27dftgd
namespace: kube-system
---
apiVersion: v1
Expand Down Expand Up @@ -1323,7 +1330,7 @@ spec:
key: node-role.kubernetes.io/master
volumes:
- configMap:
name: antrea-config-2gdh849dhk
name: antrea-config-kgd27dftgd
name: antrea-config
- name: antrea-controller-tls
secret:
Expand Down Expand Up @@ -1622,7 +1629,7 @@ spec:
operator: Exists
volumes:
- configMap:
name: antrea-config-2gdh849dhk
name: antrea-config-kgd27dftgd
name: antrea-config
- hostPath:
path: /etc/cni/net.d
Expand Down
Loading