github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix etcd hostnames

pull/6/head
Wojciech Tyczynski 2017-10-20 16:39:16 +02:00
parent 1e67feac75
commit 2fbe39fc8f
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/common.sh
View File

@ -842,6 +842,11 @@ EOF
if [ -n "${ETCD_VERSION:-}" ]; then if [ -n "${ETCD_VERSION:-}" ]; then
cat >>$file <<EOF cat >>$file <<EOF
ETCD_VERSION: $(yaml-quote ${ETCD_VERSION}) ETCD_VERSION: $(yaml-quote ${ETCD_VERSION})
EOF
fi
if [ -n "${ETCD_HOSTNAME:-}" ]; then
cat >>$file <<EOF
ETCD_HOSTNAME: $(yaml-quote ${ETCD_HOSTNAME})
EOF EOF
fi fi
if [ -n "${APISERVER_TEST_ARGS:-}" ]; then if [ -n "${APISERVER_TEST_ARGS:-}" ]; then

2
cluster/gce/configure-vm.sh
View File

@ -447,7 +447,7 @@ kube_uid: '$(echo "${KUBE_UID}" | sed -e "s/'/''/g")'
initial_etcd_cluster: '$(echo "${INITIAL_ETCD_CLUSTER:-}" | sed -e "s/'/''/g")' initial_etcd_cluster: '$(echo "${INITIAL_ETCD_CLUSTER:-}" | sed -e "s/'/''/g")'
initial_etcd_cluster_state: '$(echo "${INITIAL_ETCD_CLUSTER_STATE:-}" | sed -e "s/'/''/g")' initial_etcd_cluster_state: '$(echo "${INITIAL_ETCD_CLUSTER_STATE:-}" | sed -e "s/'/''/g")'
ca_cert_bundle_path: '$(echo "${CA_CERT_BUNDLE_PATH:-}" | sed -e "s/'/''/g")' ca_cert_bundle_path: '$(echo "${CA_CERT_BUNDLE_PATH:-}" | sed -e "s/'/''/g")'
hostname: $(hostname -s) hostname: '$(echo "${ETCD_HOSTNAME:-$(hostname -s)}" | sed -e "s/'/''/g")'
enable_pod_priority: '$(echo "${ENABLE_POD_PRIORITY:-}" | sed -e "s/'/''/g")' enable_pod_priority: '$(echo "${ENABLE_POD_PRIORITY:-}" | sed -e "s/'/''/g")'
enable_default_storage_class: '$(echo "$ENABLE_DEFAULT_STORAGE_CLASS" | sed -e "s/'/''/g")' enable_default_storage_class: '$(echo "$ENABLE_DEFAULT_STORAGE_CLASS" | sed -e "s/'/''/g")'
kube_proxy_daemonset: '$(echo "$KUBE_PROXY_DAEMONSET" | sed -e "s/'/''/g")' kube_proxy_daemonset: '$(echo "$KUBE_PROXY_DAEMONSET" | sed -e "s/'/''/g")'

2
cluster/gce/container-linux/configure-helper.sh
View File

@ -730,7 +730,7 @@ function start-kube-proxy {
# $4: value for variable 'cpulimit' # $4: value for variable 'cpulimit'
# $5: pod name, which should be either etcd or etcd-events # $5: pod name, which should be either etcd or etcd-events
function prepare-etcd-manifest { function prepare-etcd-manifest {
local host_name=$(hostname -s) local host_name=${ETCD_HOSTNAME:-$(hostname -s)}
local etcd_cluster="" local etcd_cluster=""
local cluster_state="new" local cluster_state="new"
local etcd_protocol="http" local etcd_protocol="http"

2
cluster/gce/gci/configure-helper.sh
View File

@ -1119,7 +1119,7 @@ function start-kube-proxy {
# $4: value for variable 'cpulimit' # $4: value for variable 'cpulimit'
# $5: pod name, which should be either etcd or etcd-events # $5: pod name, which should be either etcd or etcd-events
function prepare-etcd-manifest { function prepare-etcd-manifest {
local host_name=$(hostname) local host_name=${ETCD_HOSTNAME:-$(hostname -s)}
local etcd_cluster="" local etcd_cluster=""
local cluster_state="new" local cluster_state="new"
local etcd_protocol="http" local etcd_protocol="http"