Skip to content

Changing ETCD_HOST, KUBE_RSYNC_ADDR and hostname #2

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changing ETCD_HOST, KUBE_RSYNC_ADDR and hostname #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions kubernetes-docker-in-docker-cluster-v1.9.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function dind::localhost() {
if [[ ${IP_MODE} = "ipv6" ]]; then
echo '[::1]'
else
echo '127.0.0.1'
echo "$(hostname -i)"
fi
}

Expand All @@ -137,7 +137,7 @@ if [[ ! ${EMBEDDED_CONFIG:-} ]]; then
fi

CNI_PLUGIN="${CNI_PLUGIN:-bridge}"
ETCD_HOST="${ETCD_HOST:-127.0.0.1}"
ETCD_HOST="${ETCD_HOST:-$(hostname -i)}"
GCE_HOSTED="${GCE_HOSTED:-}"
DIND_ALLOW_AAAA_USE="${DIND_ALLOW_AAAA_USE:-}" # Default is to use DNS64 always for IPv6 mode
if [[ ${IP_MODE} = "ipv6" ]]; then
Expand All @@ -161,7 +161,7 @@ if [[ ${IP_MODE} = "ipv6" ]]; then
exit 1
fi
else
KUBE_RSYNC_ADDR="${KUBE_RSYNC_ADDR:-127.0.0.1}"
KUBE_RSYNC_ADDR="${KUBE_RSYNC_ADDR:-$(hostname -i)}"
SERVICE_CIDR="${SERVICE_CIDR:-10.96.0.0/12}"
dns_server="${REMOTE_DNS64_V4SERVER:-8.8.8.8}"
DEFAULT_POD_NETWORK_CIDR="10.244.0.0/16"
Expand Down Expand Up @@ -816,7 +816,7 @@ function dind::configure-kubectl {
fi
if [[ ${GCE_HOSTED} || ${DOCKER_HOST:-} =~ ^tcp: || ${using_linuxkit} || -n ${using_linuxdocker} ]]; then
if [[ "${IP_MODE}" = "ipv4" ]]; then
host="localhost"
host="$(hostname)"
else
host="[::1]"
fi
Expand Down Expand Up @@ -1417,7 +1417,7 @@ function dind::apiserver-port {
# Get the port from the master
local master port
master="$(dind::master-name)"
# 8080/tcp -> 127.0.0.1:8082 => 8082
# 8080/tcp -> $(hostname -i):8082 => 8082
port="$( docker port "$master" 2>/dev/null | awk -F: "/^${INTERNAL_APISERVER_PORT}/{ print \$NF }" )"
if [ -n "$port" ]
then
Expand Down