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.

Sign up for GitHub

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

Jump to bottom

Add init container #955

Merged
merged 4 commits into from
May 29, 2020
Merged

Add init container #955

merged 4 commits into from
May 29, 2020

Conversation

mogren
Copy link
Contributor

@mogren mogren commented May 5, 2020 •
edited
Loading

Issue #, if available:
#158, #64,

Description of changes:
Add an init container to the CNI.

  • Add init container to copy portmap and loopback binaries and set up rp_filter
  • Remove privileged from aws-node and leave "NET_ADMIN" capability only
  • Add example "master" config
  • Using sysctl from procps-ng to update the IPv4 config.
  • Tested that the default config, no AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER=false, still works

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

@mogren mogren requested a review from SaranBalaji90 May 5, 2020 22:56
@mogren mogren force-pushed the init-container branch 5 times, most recently from ed86400 to 27c41f2 Compare May 11, 2020 21:18
@mogren mogren changed the title WIP: Add init container Add init container May 12, 2020
@mogren mogren mentioned this pull request May 12, 2020
Closed
@mogren mogren force-pushed the init-container branch 2 times, most recently from 215d8ac to 5adddfb Compare May 13, 2020 21:22
@mogren mogren requested a review from anguslees May 20, 2020 22:54
@mogren mogren force-pushed the init-container branch 6 times, most recently from 86a4813 to 76d71a5 Compare May 28, 2020 06:45
jaypipes
jaypipes approved these changes May 28, 2020
View reviewed changes
Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

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

++ this is good to go, nice work Claes. Left a suggestion for renaming a make target but you can get to that in a future patch.

Makefile Outdated Show resolved Hide resolved
config/master/aws-k8s-cni-cn.yaml
@@ -137,7 +139,9 @@
"requests":
"cpu": "10m"
"securityContext":
"privileged": true
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@mogren mogren merged commit 244fdc8 into aws:master May 29, 2020
This was referenced Jun 8, 2020
Merged
Closed
@mogren mogren added this to the v1.7.0 milestone Jun 24, 2020
@mogren mogren deleted the init-container branch August 24, 2020 03:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jaypipes jaypipes jaypipes approved these changes

@SaranBalaji90 SaranBalaji90 Awaiting requested review from SaranBalaji90

@anguslees anguslees Awaiting requested review from anguslees

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
v1.7.0
Development

Successfully merging this pull request may close these issues.
2 participants
@mogren @jaypipes