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

Merge latest ecs-init & initAgentIntegration into dev #3234

Merged
merged 26 commits into from
Jun 1, 2022

Conversation

fierlion
Copy link
Member

@fierlion fierlion commented May 31, 2022

Summary

Our updated build process will build the ecs agent container (complete with cni plugins and pause container), then build the ecs-init binary and finally wrap all that up in either an rpm/deb.
This pr merges the initAgentIntegration branch which includes only fully reviewed PRs.

Implementation details

For the most part the changed files in agent/ below add build directive changes to allow us to build for old (<=1.15) and new (1.17) go versions.
The changed files in the new integrated ecs-init/ are mostly to just update the import paths.
We also have updates to the vendor directory (from go mod vendor).

The more substantive changes here are in the following locations:

  • build-infrastructure/ and buildspecs/ directories have our codebuild/codepipeline cloudformation templates and the project definitions.
  • the Makefile has multiple new build targets including dockerfree targets and ecs-init targets, as well as end-to-end "integrated" rpm/debian build targets.
  • agent-container/ has the files necessary for the agent dockerfree build process
  • misc/pause-container/ now has precompiled pause tars included for amd/arm to avoid a dependency on glibc-static
  • packaging/ has multiple updates to support the integrated build processes -- these build the rpm/deb from scratch without docker
  • scripts/ also has multiple updates to support both the integrated build process as well as the dockerfree build targets.

Testing

the changes have been built and tested using the codepipelines defined in build-infrastructure and buildspecs; all new targets have been tested in their respective environments (Ubuntu/AL2)
updated: rpm/deb integrated builds tested on AL2 and Ubuntu.

New tests cover the changes: no

Description for the changelog

Integrate new/updated build targets and processes.

Licensing

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

lydiafilipe and others added 25 commits May 31, 2022 20:55
* Resolve go modules/vendor conflicts and add dockerfree-all make target

* add build-time configuration and update scripts/comments
Note -- windows tests failing due to unrelated volume size change.
* separated the merge-build and pr-build buildspecs

* aim the codebuild stack at the right buildspec

* updated the buildspecs to release and sign arm variants as well

* updated the build infrastructure to build for arm as well as amd archs

* added a note about adding more artifacts to be signed and copied

* fixing a couple of other things found in review

* added a bucket stack with a bucket policy

* missed a letter in the arm build naming

* added a missed file in the build directory structure

* updated the descriptions for all of the codebuild projects
 Author:    Ray Allan <fierlion@amazon.com>
…ot being found (aws#3210)

* updated the build infrastructure to build for arm as well as amd archs

* added a note about adding more artifacts to be signed and copied

* fixing a couple of other things found in review

* updated the descriptions for all of the codebuild projects

* added a buildspec to pull logs from cloudwatch logs and put them in s3

* give cloudwatch access to write logs to the release bucket

* added a logs puller codebuild project that just gets logs from the preceding steps

* refactored the adding a new artifact steps to be less wall-of-text-y

* resolved an issue where the buildspec wouldn't be found by actions not pulling the whole source
This reverts commit 6f0f7c5e90e8111329e2baa3bc53c32674f4ce58.
This reverts commit 0a867c7710ce53ea3134be9f85eac19fdc79412b.
…h0 if none can be found (aws#498)

check ipv4 routes for default network interface, only fall back to eth0 if none can be found
@fierlion fierlion changed the title [WIP] Init agent integration merge latest ecs-init & initAgentIntegration into dev May 31, 2022
@fierlion fierlion changed the title merge latest ecs-init & initAgentIntegration into dev Merge latest ecs-init & initAgentIntegration into dev May 31, 2022
@fierlion fierlion merged commit 629c7eb into aws:dev Jun 1, 2022
@ubhattacharjya ubhattacharjya added this to the 1.61.2 milestone Jun 1, 2022
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.