EC2 task networking for Windows: Build vpc-eni CNI plugin for Windows

.github/workflows/windows.yml

@@ -20,4 +20,4 @@ jobs:
         $Env:GOPATH = "$Env:GITHUB_WORKSPACE"
         cd "$Env:GITHUB_WORKSPACE"
         cd "src/github.com/aws/amazon-ecs-agent"
-        go test -v -race -tags unit -timeout 40s ./agent/...
+        go test -race -tags unit -timeout 40s ./agent/...

agent/ecscni/plugin_linux.go

@@ -30,10 +30,6 @@ import (
 )
 
 const (
-	// ECSCNIVersion, ECSCNIGitHash, VPCCNIGitHash needs to be updated every time CNI plugin is updated.
-	currentECSCNIVersion      = "2020.09.0"
-	currentECSCNIGitHash      = "55b2ae77ee0bf22321b14f2d4ebbcc04f77322e1"
-	currentVPCCNIGitHash      = "a21d3a41f922e14c19387713df66be3e4ee1e1f6"
 	vpcCNIPluginInterfaceType = "vlan"
 	// vpcCNIPluginPath is the path of the cni plugin's log file.
 	vpcCNIPluginPath = "/log/vpc-branch-eni.log"

agent/ecscni/plugin_linux_test.go

@@ -20,11 +20,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
-	"os/exec"
-	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 
@@ -616,32 +612,3 @@ func TestCNIPluginVersion(t *testing.T) {
 		})
 	}
 }
-
-// Asserts that CNI plugin version matches the expected version
-func TestCNIPluginVersionNumber(t *testing.T) {
-	versionStr := getCNIVersionString(t)
-	assert.Equal(t, versionStr, currentECSCNIVersion)
-}
-
-// Asserts that CNI plugin version is upgraded when new commits are made to CNI plugin submodule
-func TestCNIPluginVersionUpgrade(t *testing.T) {
-	versionStr := getCNIVersionString(t)
-	cmd := exec.Command("git", "submodule")
-	versionInfo, err := cmd.Output()
-	assert.NoError(t, err, "Error running the command: git submodule")
-	versionInfoStrList := strings.Split(string(versionInfo), "\n")
-	// If a new commit is added, version should be upgraded
-	if currentECSCNIGitHash != strings.Split(versionInfoStrList[0], " ")[1] {
-		assert.NotEqual(t, currentECSCNIVersion, versionStr)
-	}
-	assert.Equal(t, currentVPCCNIGitHash, strings.Split(versionInfoStrList[1], " ")[1])
-}
-
-// Returns the version in CNI plugin VERSION file as a string
-func getCNIVersionString(t *testing.T) string {
-	// ../../amazon-ecs-cni-plugins/VERSION
-	versionFilePath := filepath.Clean(filepath.Join("..", "..", "amazon-ecs-cni-plugins", "VERSION"))
-	versionStr, err := ioutil.ReadFile(versionFilePath)
-	assert.NoError(t, err, "Error reading the CNI plugin version file")
-	return strings.TrimSpace(string(versionStr))
-}

agent/ecscni/plugin_test.go

@@ -0,0 +1,62 @@
+// +build unit
+
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//	http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
+package ecscni
+
+import (
+	"io/ioutil"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	// ECSCNIVersion, ECSCNIGitHash, VPCCNIGitHash needs to be updated every time CNI plugin is updated.
+	currentECSCNIVersion = "2020.09.0"
+	currentECSCNIGitHash = "55b2ae77ee0bf22321b14f2d4ebbcc04f77322e1"
+	currentVPCCNIGitHash = "941c5280e8a3329194cd78454454332610333822"
+)
+
+// Asserts that CNI plugin version matches the expected version
+func TestCNIPluginVersionNumber(t *testing.T) {
+	versionStr := getCNIVersionString(t)
+	assert.Equal(t, versionStr, currentECSCNIVersion)
+}
+
+// Asserts that CNI plugin version is upgraded when new commits are made to CNI plugin submodule
+func TestCNIPluginVersionUpgrade(t *testing.T) {
+	versionStr := getCNIVersionString(t)
+	cmd := exec.Command("git", "submodule")
+	versionInfo, err := cmd.Output()
+	assert.NoError(t, err, "Error running the command: git submodule")
+	versionInfoStrList := strings.Split(string(versionInfo), "\n")
+	// If a new commit is added, version should be upgraded
+	if currentECSCNIGitHash != strings.Split(versionInfoStrList[0], " ")[1] {
+		assert.NotEqual(t, currentECSCNIVersion, versionStr)
+	}
+	assert.Equal(t, currentVPCCNIGitHash, strings.Split(versionInfoStrList[1], " ")[1])
+}
+
+// Returns the version in CNI plugin VERSION file as a string
+func getCNIVersionString(t *testing.T) string {
+	// ../../amazon-ecs-cni-plugins/VERSION
+	versionFilePath := filepath.Clean(filepath.Join("..", "..", "amazon-ecs-cni-plugins", "VERSION"))
+	versionStr, err := ioutil.ReadFile(versionFilePath)
+	assert.NoError(t, err, "Error reading the CNI plugin version file")
+	return strings.TrimSpace(string(versionStr))
+}

agent/ecscni/plugin_windows_test.go

@@ -103,6 +103,9 @@ func TestSetupNSTimeout(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
+	// Override the maximum retry timeout for the tests
+	setupNSBackoffMax = setupNSBackoffMin
+
 	ecscniClient := NewClient("")
 	libcniClient := mock_libcni.NewMockCNI(ctrl)
 	ecscniClient.(*cniClient).libcni = libcniClient
@@ -111,7 +114,7 @@ func TestSetupNSTimeout(t *testing.T) {
 		// vpc-eni plugin will be called.
 		libcniClient.EXPECT().AddNetwork(gomock.Any(), gomock.Any(), gomock.Any()).Return(&current.Result{}, errors.New("timeout")).Do(
 			func(ctx context.Context, net *libcni.NetworkConfig, rt *libcni.RuntimeConf) {
-			}).MaxTimes(3),
+			}).MaxTimes(setupNSMaxRetryCount),
 	)
 
 	config := getNetworkConfig()

agent/ecscni/types_windows.go

@@ -28,12 +28,16 @@ const (
 	ECSVPCENIPluginExecutable = "vpc-eni.exe"
 	// ECSBridgeNetworkName is the name of the HNS network used as ecs-bridge.
 	ECSBridgeNetworkName = "nat"
-	// Constants for creating backoff while retrying setupNS.
+)
+
+var (
+	// Values for creating backoff while retrying setupNS.
+	// These have not been made constant so that we can inject different values for unit tests.
 	setupNSBackoffMin      = time.Second * 4
 	setupNSBackoffMax      = time.Minute
 	setupNSBackoffJitter   = 0.2
-	setupNSBackoffMultiple = 1.3
-	setupNSMaxRetryCount   = 3
+	setupNSBackoffMultiple = 2.0
+	setupNSMaxRetryCount   = 5
 )
 
 // VPCENIPluginConfig contains all the information required to invoke the vpc-eni plugin.

scripts/dockerfiles/Dockerfile.buildWindowsVPCCNIPlugins

@@ -19,10 +19,9 @@ ARG GOARCH
 
 ENV GOARCH ${GOARCH}
 ENV GOOS windows
-ENV BUILD_FLAGS "-tags disablekubeapi"
 
 RUN mkdir -p /go/src/github.com/aws/
 
 WORKDIR /go/src/github.com/aws/amazon-vpc-cni-plugins
 
-CMD ["make", "vpc-shared-eni"]
+CMD ["make", "vpc-eni"]

scripts/local-save

@@ -31,10 +31,10 @@ stage_windows() {
 	cp out/amazon-ecs-agent.exe "${ziproot}"
 	cp -v misc/windows-deploy/*.ps1 "${ziproot}"
 
-	if [[ -f "${buildroot}/out/cni-plugins/vpc-shared-eni" ]]
+	if [[ -f "${buildroot}/out/cni-plugins/vpc-eni" ]]
 	then
 	  mkdir "${ziproot}/cni"
-	  mv "${buildroot}/out/cni-plugins/vpc-shared-eni" "${ziproot}/cni/vpc-shared-eni.exe"
+	  mv "${buildroot}/out/cni-plugins/vpc-eni" "${ziproot}/cni/vpc-eni.exe"
 	fi
 
 	pushd "${ziproot}"