Init agent integration al1 #3153
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Tests were complaining because of a mismatch.
* No longer pull godep * Start pulling golint
Bundle ECS Agent tarball in package
The process executed by the ecs.service is going to remain running to supervise the ECS agent and handles lifecycle with the Exec* directives and also internally where required (eg: for agent upgrade functionality).
Add ecs systemd unit for al2 and update man page
Revert "Add ecs systemd unit for al2"
Update dev to reverted master
… change from false to true
update ecs-init to add bind mounts to the ecs-agent containter for exec-for-ECS capability detection. For an EC2 instance to be considered as exec-enabed, the instance needs to have resources required by SSM. commits: * add bind mounts for exec capability detection * update comments * make constants global for unit tests * add ut, initialize slice as nil * simplify function_ptr, fix UTs * add global function and update tests * fix tests unrelated to exec * validate HostConfig.Binds with exec binds
* update capability name, add config to agent binds * update container root directory, change var name * shorten names, remove capability prefix
Feature/ecs exec
Prevent restart on exit code 5
YashdalfTheGray
approved these changes
Mar 21, 2022
fierlion
reviewed
Mar 22, 2022
fierlion
approved these changes
Mar 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This pr is an initial commit to integrate ecs init as-is and ecs agent for our AL1 versions. This follows a similar approach to #3141, which was done for our current latest versions.
Implementation details
Created clones of both the init and agent packages.
Removed/changed some of the files that would conflict in the init package and committed the changes:
git clone --branch v1.51.0-1 https://github.com/aws/amazon-ecs-init.git
git checkout -b initAgentPreMerge
git remote rm origin
git rm .github/ISSUE_TEMPLATE.md
git rm .github/PULL_REQUEST_TEMPLATE.md
git rm .gitignore
git mv Makefile init_Makefile
git mv CHANGELOG.md INIT_CHANGELOG.md
git rm NOTICE
git mv README.md INIT_README.md
git rm THIRD-PARTY
git rm scripts/analyze-cover-profile
git rm CODE_OF_CONDUCT.md
git rm CONTRIBUTING.md
git commit -a -m "file changes for merge"
git gc --aggressive
Created initAgentIntegrationAL1 branch in upstream from the 1.51.0 tag. Then ran the following in the agent package to merge init:
git clone --branch v1.51.0 https://github.com/aws/amazon-ecs-agent.git
git checkout -b initAgentIntegrationAL1
git remote add init ~/go/src/repoclones/amazon-ecs-init
git fetch init --tags
git pull init initAgentPreMerge --allow-unrelated-histories
Pushed to #3151 branch.
The static checks currently fail for the agent version tagged at 1.51.0, as evidenced by this pr, so for this pr we also removed the static check from the worflow.
Description for the changelog
Base changes to integrate ECS Init into ECS Agent for AL1
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.