Fix Windows AddNodePort parameter error

Use VirtualNodePortDNATIPv4 to replace VirtualServiceIPv4. Signed-off-by: Shuyang Xin <[email protected]>
antrea-io · Aug 16, 2022 · b2102f2 · b2102f2
1 parent 173ef52
commit b2102f2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/pkg/agent/route/route_windows.go b/pkg/agent/route/route_windows.go
@@ -387,7 +387,7 @@ func (c *Client) DeleteSNATRule(mark uint32) error {
 
 // TODO: nodePortAddresses is not supported currently.
 func (c *Client) AddNodePort(nodePortAddresses []net.IP, port uint16, protocol binding.Protocol) error {
-	return util.ReplaceNetNatStaticMapping(antreaNatNodePort, "0.0.0.0", port, config.VirtualServiceIPv4.String(), port, string(protocol))
+	return util.ReplaceNetNatStaticMapping(antreaNatNodePort, "0.0.0.0", port, config.VirtualNodePortDNATIPv4.String(), port, string(protocol))
 }
 
 func (c *Client) DeleteNodePort(nodePortAddresses []net.IP, port uint16, protocol binding.Protocol) error {

diff --git a/test/e2e/connectivity_test.go b/test/e2e/connectivity_test.go
@@ -69,6 +69,9 @@ func TestConnectivity(t *testing.T) {
 		skipIfNumNodesLessThan(t, 2)
 		testPingLargeMTU(t, data)
 	})
+	if len(clusterInfo.windowsNodes) != 0 {
+		time.Sleep(30 * time.Second)
+	}
 }
 
 func waitForPodIPs(t *testing.T, data *TestData, podInfos []podInfo) map[string]*PodIPs {

diff --git a/test/e2e/framework.go b/test/e2e/framework.go
@@ -124,7 +124,7 @@ const (
 	mcjoinImage         = "projects.registry.vmware.com/antrea/mcjoin:v2.9"
 	netshootImage       = "projects.registry.vmware.com/antrea/netshoot:v0.1"
 	nginxImage          = "projects.registry.vmware.com/antrea/nginx:1.21.6-alpine"
-	iisImage            = "mcr.microsoft.com/windows/servercore/iis"
+	iisImage            = "mcr.microsoft.com/windows/servercore/iis:latest"
 	perftoolImage       = "projects.registry.vmware.com/antrea/perftool"
 	ipfixCollectorImage = "projects.registry.vmware.com/antrea/ipfix-collector:v0.5.12"
 	ipfixCollectorPort  = "4739"

diff --git a/test/e2e/nodeportlocal_test.go b/test/e2e/nodeportlocal_test.go
@@ -369,6 +369,7 @@ func NPLTestMultiplePods(t *testing.T, data *TestData) {
 	node := nodeName(0)
 	workerNode := node
 	if len(clusterInfo.windowsNodes) != 0 {
+		time.Sleep(10 * time.Second)
 		workerNode = workerNodeName(clusterInfo.windowsNodes[0])
 	}
 	testData.createNginxClusterIPServiceWithAnnotations(workerNode, false, &ipFamily, annotation)