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.

Sign up for GitHub

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

Jump to bottom

[IPv6] Fix issues #1496

Merged
merged 1 commit into from
Nov 5, 2020
Merged

[IPv6] Fix issues #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions build/yamls/antrea-aks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,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 @@ -1316,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 @@ -1580,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
6 changes: 3 additions & 3 deletions build/yamls/antrea-eks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,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 @@ -1316,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 @@ -1582,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
6 changes: 3 additions & 3 deletions build/yamls/antrea-gke.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,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 @@ -1316,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 @@ -1580,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
6 changes: 3 additions & 3 deletions build/yamls/antrea-ipsec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,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 @@ -1330,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 @@ -1629,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
6 changes: 3 additions & 3 deletions build/yamls/antrea.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,7 @@ metadata:
annotations: {}
labels:
app: antrea
name: antrea-config-t5k2d655gm
name: antrea-config-2hk276fdf4
namespace: kube-system
---
apiVersion: v1
Expand Down Expand Up @@ -1321,7 +1321,7 @@ spec:
key: node-role.kubernetes.io/master
volumes:
- configMap:
name: antrea-config-t5k2d655gm
name: antrea-config-2hk276fdf4
name: antrea-config
- name: antrea-controller-tls
secret:
Expand Down Expand Up @@ -1585,7 +1585,7 @@ spec:
operator: Exists
volumes:
- configMap:
name: antrea-config-t5k2d655gm
name: antrea-config-2hk276fdf4
name: antrea-config
- hostPath:
path: /etc/cni/net.d
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/flowexporter/connections/conntrack_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TestConnTrackSystem_DumpFlows(t *testing.T) {
}
nodeConfig := &config.NodeConfig{
GatewayConfig: gwConfig,
PodCIDR: &net.IPNet{
PodIPv4CIDR: &net.IPNet{
IP: net.IP{1, 2, 3, 0},
Mask: net.IPMask{255, 255, 255, 0},
},
Expand Down