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

Init integration foundation #3138

Closed
wants to merge 553 commits into from
Closed

Init integration foundation #3138

wants to merge 553 commits into from

Conversation

fierlion
Copy link
Member

@fierlion fierlion commented Feb 25, 2022

Summary

This is the initial commit to begin integrating ECS Init into ECS Agent; we'll be building the rest of our init integrations on top of this PR's changes, but we want to merge the present changes to allow for future rebases against dev branch.
See the proposal here: aws/amazon-ecs-init#482

Note that the Commit SHAs in the history are not changed and that the Agent and Init commits are interleaved by date.

Implementation details

To create this PR, I cloned https://github.com/aws/amazon-ecs-init.git and checked out the dev branch.
(For safety, I deleted the remote using git remote rm origin).
I renamed/removed the following set of files from init as they collided with existing files in agent:

    both added:      .github/ISSUE_TEMPLATE.md
    both added:      .github/PULL_REQUEST_TEMPLATE.md
    both added:      .github/workflows/gitsecrets.yml
    both added:      .gitignore
    both added:      CHANGELOG.md
    both added:      CONTRIBUTING.md
    both added:      Makefile
    both added:      NOTICE
    both added:      README.md
    both added:      THIRD-PARTY
    both added:      scripts/analyze-cover-profile

I then cleaned the init repo:

git reset --hard
git gc --aggressive 
git prune
git clean -fd

I then cloned https://github.com/aws/amazon-ecs-agent.git and checked out the dev branch
I set the ecs-init repo as a remote git remote add init-repo ../amazon-ecs-init/ and pulled the changes from my init branch into agent with included history: git pull init-repo initIntegration --allow-unrelated-histories.

Description for the changelog

Base changes to integrate ECS Init into ECS Agent.

Licensing

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

haikuoliu and others added 30 commits January 10, 2019 15:48
Merge gpu-support branch into dev branch
Update systemd unit description and add url
This is needed as the aws-appmesh cni plugin needs to invoke `iptables` command.
The ECS agent container doesn't have the necessary lib and binary paths to invoke this command.
The additional volume mounts /sbin, /usr/lib64, /lib64 help with that.
Add binding for agent container to be able to run iptables.
iptables also relies on these libraries in order to execute successfully
Adding "/lib" and "/usr/lib" to the binds
Some usages of agent will require the agent container to have permissions
elevated beyond cap NET_ADMIN. This can now be accessed by modifying the
following environment variable and invoking ecs-init:

` export ECS_AGENT_RUN_PRIVILEGED=true `

This is not recommended for general use and may be removed in future versions
of ecs-init.
* Cache agent 1.26.1
Merge master back to dev after 1.28.0 release
User existing backoff package

Change Info log message to Warn

add variable names to NewBackoff arguments
@fierlion fierlion closed this Feb 25, 2022
@fierlion fierlion reopened this Feb 25, 2022
@fierlion fierlion requested review from angelcar and sparrc February 25, 2022 23:53
@fierlion fierlion changed the base branch from master to dev February 26, 2022 00:35
@fierlion
Copy link
Member Author

fierlion commented Mar 7, 2022

closing in favor of the updated PR against the latest (post release 1.60): #3141

@fierlion fierlion closed this Mar 7, 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.