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

Update start script to wait for ipamd health check #553

Merged
merged 1 commit into from
Aug 1, 2019

Conversation

mogren
Copy link
Contributor

@mogren mogren commented Aug 1, 2019

Issue #, if available: #282

Description of changes:

  • Update start script to wait for ipamd health check to return SERVING before copying in the CNI binary and config file, making the node Ready.
  • Tested by scheduling pods with 0 worker nodes in the ASG, then scaling up. The nodes do not become ready until ipamd is running.

This is a quick fix for the release-1.5 branch. It will also add additional log lines to the aws-node stdout logs. The long term goal will probably be to move the set up into go instead and have ipamd copy the files once it's ready.

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

scripts/install-aws.sh Outdated Show resolved Hide resolved
Wait for the ipamd health check to be SERVING before copying in the CNI
binary and config file. aws#282

echo "===== Starting amazon-k8s-agent ==========="
/app/aws-k8s-agent
main
Copy link
Contributor

Choose a reason for hiding this comment

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

Even though there are no positional parameters, I personally would add main "$@"

cp /app/10-aws.conflist /host/etc/cni/net.d/

if [[ -f /host/etc/cni/net.d/aws.conf ]]; then

Copy link
Contributor

Choose a reason for hiding this comment

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

Probably fail fast, by adding set -eo pipefail

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, will add.

@mogren mogren merged commit 79fd64a into aws:release-1.5 Aug 1, 2019
@xrl
Copy link

xrl commented Aug 1, 2019

I've been eagerly anticipating something like this. When should we expect it to show up in an official image I can start running?

@nithu0115
Copy link
Contributor

nithu0115 commented Aug 1, 2019

Issue #555 is a follow up to this PR with new release candidate image which will include these changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants