Upgrading the amazon-vpc-cni plugins submodule

aws · Jul 1, 2021 · c31abe2 · c31abe2
1 parent c09ce7d
commit c31abe2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/agent/ecscni/namespace_helper_windows.go b/agent/ecscni/namespace_helper_windows.go
@@ -100,7 +100,7 @@ func (nsHelper *helper) ConfigureTaskNamespaceRouting(ctx context.Context, taskE
 	}
 
 	// Invoke the generated commands inside the task namespace.
-	err := nsHelper.invokeCommandsInsideContainer(ctx, config.ContainerID, commands, " && ")
+	err := nsHelper.invokeCommandsInsideContainer(ctx, config.ContainerID, commands, " & ")
 	if err != nil {
 		return errors.Wrapf(err, "failed to execute commands inside task namespace")
 	}

diff --git a/agent/ecscni/namespace_helper_windows_test.go b/agent/ecscni/namespace_helper_windows_test.go
@@ -96,7 +96,7 @@ func TestConfigureTaskNamespaceRouting(t *testing.T) {
 				cmd4 = fmt.Sprintf(windowsRouteAddCmdFormat, imdsEndpointIPAddress, taskEPName)
 			}
 			cmd5 := fmt.Sprintf(windowsRouteAddCmdFormat, "10.0.0.0/24", bridgeEpName)
-			finalCmd := strings.Join([]string{cmd1, cmd2, cmd3, cmd4, cmd5}, " && ")
+			finalCmd := strings.Join([]string{cmd1, cmd2, cmd3, cmd4, cmd5}, " & ")
 
 			gomock.InOrder(
 				dockerClient.EXPECT().CreateContainerExec(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Do(

diff --git a/agent/ecscni/plugin_test.go b/agent/ecscni/plugin_test.go
@@ -29,7 +29,7 @@ const (
 	// ECSCNIVersion, ECSCNIGitHash, VPCCNIGitHash needs to be updated every time CNI plugin is updated.
 	currentECSCNIVersion = "2020.09.0"
 	currentECSCNIGitHash = "55b2ae77ee0bf22321b14f2d4ebbcc04f77322e1"
-	currentVPCCNIGitHash = "941c5280e8a3329194cd78454454332610333822"
+	currentVPCCNIGitHash = "a8d6ad919d27fa15ec1744b51051b22d77b5c26c"
 )
 
 // Asserts that CNI plugin version matches the expected version

diff --git a/amazon-vpc-cni-plugins b/amazon-vpc-cni-plugins