Skip to content
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

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

Merged

Conversation

rawahars
Copy link
Contributor

@rawahars rawahars commented Jun 9, 2021

Summary

The changes introduced in this PR are-

  • Build the vpc-eni plugin for Windows
  • Updated the retry values during setup NS

Implementation details

The changes were implemented using -

  • Build vpc-eni plugins during the agent build
  • Changed the max retries to 5 and retryMultiplier to 2. These changes are based on the practical observations.

Testing

A custom binary of the agent was tested.
New tests cover the changes:
No new changes have been introduced.

Description for the changelog

Build vpc-eni plugin for ECS Windows task networking

Licensing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Copy link
Contributor

@vsiddharth vsiddharth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good. Can you please look into the test failures?

@@ -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/...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we remove the -v ?

Copy link
Contributor Author

@rawahars rawahars Jun 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By removing this flag, we are able to remove the excess noise from the UTs during PR. We can very easily pin point the UT which failed and the corresponding error. For example - https://github.com/aws/amazon-ecs-agent/runs/2786834601?check_suite_focus=true

Also, this ensures that the behavior is same for Linux and Windows UT during PR build.
This change was implemented after discussion with @fenxiong

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 👍

agent/ecscni/types_windows.go Outdated Show resolved Hide resolved
Copy link
Contributor

@vsiddharth vsiddharth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neat 🚀

@@ -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/...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 👍

@fenxiong fenxiong merged commit 0d21d17 into aws:feature/awsvpc-windows Jun 10, 2021
rawahars added a commit to rawahars/amazon-ecs-agent that referenced this pull request Jun 23, 2021
…aws#2893)

* Added CNI plugin version upgrade code to common file

* Build vpc-eni cni plugin for Windows

* Updated the git submodule for vpc-cni plugins

* Disabled verbose option for Windows unit tests

* Updated git submodule vpc-cni-plugins to latest release

* Updated values for max retry during network setup
rawahars added a commit to rawahars/amazon-ecs-agent that referenced this pull request Jun 24, 2021
…aws#2893)

* Added CNI plugin version upgrade code to common file

* Build vpc-eni cni plugin for Windows

* Updated the git submodule for vpc-cni plugins

* Disabled verbose option for Windows unit tests

* Updated git submodule vpc-cni-plugins to latest release

* Updated values for max retry during network setup
rawahars added a commit to rawahars/amazon-ecs-agent that referenced this pull request Jun 29, 2021
…aws#2893)

* Added CNI plugin version upgrade code to common file

* Build vpc-eni cni plugin for Windows

* Updated the git submodule for vpc-cni plugins

* Disabled verbose option for Windows unit tests

* Updated git submodule vpc-cni-plugins to latest release

* Updated values for max retry during network setup
rawahars added a commit to rawahars/amazon-ecs-agent that referenced this pull request Jun 29, 2021
…aws#2893)

* Added CNI plugin version upgrade code to common file

* Build vpc-eni cni plugin for Windows

* Updated the git submodule for vpc-cni plugins

* Disabled verbose option for Windows unit tests

* Updated git submodule vpc-cni-plugins to latest release

* Updated values for max retry during network setup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants