Skip to content

Upgrading the amazon-vpc-cni plugins submodule #2930

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.

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

Merged
merged 1 commit into from
Jul 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 1 deletion agent/ecscni/namespace_helper_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ func (nsHelper *helper) ConfigureTaskNamespaceRouting(ctx context.Context, taskE
}

// Invoke the generated commands inside the task namespace.
err := nsHelper.invokeCommandsInsideContainer(ctx, config.ContainerID, commands, " && ")
// On Windows 2004 and 20H2, there are a few stdout messages which leads to the failure of the tasks.
// By using &, we ensure that the commands are executed irrespectively. In case of error, the
// other commands can be executed (all commands are independent of each other) and the error would be
// reported to agent. Since the agent will kill the task, execution of other commands is immaterial.
err := nsHelper.invokeCommandsInsideContainer(ctx, config.ContainerID, commands, " & ")
if err != nil {
return errors.Wrapf(err, "failed to execute commands inside task namespace")
}
Expand Down
2 changes: 1 addition & 1 deletion agent/ecscni/namespace_helper_windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion agent/ecscni/plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down