Skip to content

K
k3s
Commit 924015dc authored by CJ Cullen's avatar CJ Cullen
Browse files
Options

Merge pull request #7182 from justinsb/aws_fix_hostname

AWS: Set hostname_override for minions, back to fully-qualified name
parents 26aeb6c3 4120849c
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
cluster/aws/templates/salt-minion.sh
View file @ 924015dc
......@@ -30,6 +30,18 @@ grains:
cloud: aws
EOF
# We set the hostname_override to the full EC2 private dns name
# we'd like to use EC2 instance-id, but currently the kubelet health-check assumes the name
# is resolvable, although that check should be going away entirely (#7092)
if [[ -z "${HOSTNAME_OVERRIDE}" ]]; then
HOSTNAME_OVERRIDE=`curl --silent curl http://169.254.169.254/2007-01-19/meta-data/local-hostname`
fi
if [[ -n "${HOSTNAME_OVERRIDE}" ]]; then
cat <<EOF >>/etc/salt/minion.d/grains.conf
hostname_override: "${HOSTNAME_OVERRIDE}"
EOF
fi
if [[ -n "${DOCKER_OPTS}" ]]; then
cat <<EOF >>/etc/salt/minion.d/grains.conf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment