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

Cherry-pick entrypoint script improvements from PR #839 #843

Merged
merged 2 commits into from
Feb 12, 2020
Merged

Cherry-pick entrypoint script improvements from PR #839 #843

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e10e323
Make entrypoint shell script fail if any step fails.
drakedevel Feb 11, 2020
bd5be65
Remove unnecessary command substitutions from entrypoint script.
drakedevel Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions scripts/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
# CNI plugin binary and its configuration file to the well-known directory that
# Kubelet looks in.

# turn on exit on subprocess error and exit on undefined variables
set -eu
# turn on bash's job control
set -m

Expand All @@ -45,7 +47,7 @@ wait_for_ipam() {

until [ $__sleep_time -eq 8 ]; do
sleep $(( __sleep_time++ ))
if $(./grpc-health-probe -addr 127.0.0.1:50051 >/dev/null 2>&1); then
if ./grpc-health-probe -addr 127.0.0.1:50051 >/dev/null 2>&1; then
return 0
fi
done
Expand Down Expand Up @@ -84,7 +86,7 @@ fi

# bring the aws-k8s-agent process back into the foreground
echo "foregrounding IPAM daemon ... "
fg %1 >/dev/null 2>&1 || $(echo "failed (process terminated)" && cat "$AGENT_LOG_PATH" && exit 1)
fg %1 >/dev/null 2>&1 || { echo "failed (process terminated)" && cat "$AGENT_LOG_PATH" && exit 1; }

# Best practice states we should send the container's CMD output to stdout, so
# let's tee back up the log file into stdout
Expand Down