From c13ee9354f14d85f576e6fc2a379f7a258f2f478 Mon Sep 17 00:00:00 2001
From: Zhecheng Li <lzhecheng@vmware.com>
Date: Thu, 5 Nov 2020 18:23:59 +0800
Subject: [PATCH] [IPv6] Fix issues (#1496)

* unit test
* manifest
---
 build/yamls/antrea-aks.yml                                 | 6 +++---
 build/yamls/antrea-eks.yml                                 | 6 +++---
 build/yamls/antrea-gke.yml                                 | 6 +++---
 build/yamls/antrea-ipsec.yml                               | 6 +++---
 build/yamls/antrea.yml                                     | 6 +++---
 pkg/agent/flowexporter/connections/conntrack_linux_test.go | 2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
index 32f812c50b6..76ae0479b4c 100644
--- a/build/yamls/antrea-aks.yml
+++ b/build/yamls/antrea-aks.yml
@@ -1209,7 +1209,7 @@ metadata:
   annotations: {}
   labels:
     app: antrea
-  name: antrea-config-2fm49f65tg
+  name: antrea-config-hmttgfbf78
   namespace: kube-system
 ---
 apiVersion: v1
@@ -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:
@@ -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
diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
index d1c8871d122..daaad626aaf 100644
--- a/build/yamls/antrea-eks.yml
+++ b/build/yamls/antrea-eks.yml
@@ -1209,7 +1209,7 @@ metadata:
   annotations: {}
   labels:
     app: antrea
-  name: antrea-config-2fm49f65tg
+  name: antrea-config-hmttgfbf78
   namespace: kube-system
 ---
 apiVersion: v1
@@ -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:
@@ -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
diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
index fa34a81f129..f8e3759b39f 100644
--- a/build/yamls/antrea-gke.yml
+++ b/build/yamls/antrea-gke.yml
@@ -1209,7 +1209,7 @@ metadata:
   annotations: {}
   labels:
     app: antrea
-  name: antrea-config-m742b78ct4
+  name: antrea-config-8bc4m9g22g
   namespace: kube-system
 ---
 apiVersion: v1
@@ -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:
@@ -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
diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
index 3f0cb4abeac..88a3f1f5b73 100644
--- a/build/yamls/antrea-ipsec.yml
+++ b/build/yamls/antrea-ipsec.yml
@@ -1214,7 +1214,7 @@ metadata:
   annotations: {}
   labels:
     app: antrea
-  name: antrea-config-2gdh849dhk
+  name: antrea-config-kgd27dftgd
   namespace: kube-system
 ---
 apiVersion: v1
@@ -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:
@@ -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
diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
index da92b499c9c..76997b8f099 100644
--- a/build/yamls/antrea.yml
+++ b/build/yamls/antrea.yml
@@ -1214,7 +1214,7 @@ metadata:
   annotations: {}
   labels:
     app: antrea
-  name: antrea-config-t5k2d655gm
+  name: antrea-config-2hk276fdf4
   namespace: kube-system
 ---
 apiVersion: v1
@@ -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:
@@ -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
diff --git a/pkg/agent/flowexporter/connections/conntrack_linux_test.go b/pkg/agent/flowexporter/connections/conntrack_linux_test.go
index 8e093e213e4..6beae1de97c 100644
--- a/pkg/agent/flowexporter/connections/conntrack_linux_test.go
+++ b/pkg/agent/flowexporter/connections/conntrack_linux_test.go
@@ -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},
 		},