Merge "Remove $myip when unnecessary and use KUBE_NODE_IP"

This commit is contained in:
Jenkins 2017-02-11 19:11:33 +00:00 committed by Gerrit Code Review
commit faed9a18ed
9 changed files with 26 additions and 22 deletions

View File

@ -21,7 +21,9 @@ write_files:
content: |
#!/bin/sh
myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
if [ -z "${KUBE_NODE_IP}" ]; then
KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
fi
DROP_IN_FILE=/etc/systemd/system/etcd2.service.d/20-configure-etcd.conf
mkdir -p $(dirname $DROP_IN_FILE)
@ -32,13 +34,13 @@ write_files:
fi
cat > $DROP_IN_FILE <<EOF
[Service]
Environment=ETCD_NAME=$myip
Environment=ETCD_NAME=$KUBE_NODE_IP
Environment=ETCD_DATA_DIR=/var/lib/etcd/default.etcd
Environment=ETCD_LISTEN_CLIENT_URLS=$protocol://$myip:2379,http://127.0.0.1:2379
Environment=ETCD_LISTEN_PEER_URLS=$protocol://$myip:2380
Environment=ETCD_LISTEN_CLIENT_URLS=$protocol://$KUBE_NODE_IP:2379,http://127.0.0.1:2379
Environment=ETCD_LISTEN_PEER_URLS=$protocol://$KUBE_NODE_IP:2380
Environment=ETCD_ADVERTISE_CLIENT_URLS=$protocol://$myip:2379,http://127.0.0.1:2379
Environment=ETCD_INITIAL_ADVERTISE_PEER_URLS=$protocol://$myip:2380
Environment=ETCD_ADVERTISE_CLIENT_URLS=$protocol://$KUBE_NODE_IP:2379,http://127.0.0.1:2379
Environment=ETCD_INITIAL_ADVERTISE_PEER_URLS=$protocol://$KUBE_NODE_IP:2380
Environment=ETCD_DISCOVERY=$ETCD_DISCOVERY_URL
EOF

View File

@ -23,8 +23,6 @@ write_files:
content: |
#!/bin/sh
myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
until curl -sf "http://127.0.0.1:8080/healthz"
do
echo "Waiting for Kubernetes API..."

View File

@ -21,8 +21,6 @@ write_files:
content: |
#!/bin/sh
myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
TLS_CERT_FILE=${KUBE_CERTS_PATH}/apiserver.pem
TLS_PRIVATE_KEY_FILE=${KUBE_CERTS_PATH}/apiserver-key.pem
CLIENT_CA_FILE=${KUBE_CERTS_PATH}/ca.pem

View File

@ -21,8 +21,6 @@ write_files:
content: |
#!/bin/sh
myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
TEMPLATE=/etc/kubernetes/manifests/kube-proxy.yaml
mkdir -p $(dirname ${TEMPLATE})
cat > ${TEMPLATE} <<EOF

View File

@ -21,8 +21,6 @@ write_files:
content: |
#!/bin/sh
myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
KUBE_CONFIG_PATH=/etc/kubernetes/config
KUBE_PROTOCOL="https"
KUBE_CONFIG="${KUBE_CONFIG_PATH}/worker-kubeconfig.yaml"

View File

@ -21,7 +21,9 @@ write_files:
content: |
#!/bin/sh
myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
if [ -z "${KUBE_NODE_IP}" ]; then
KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
fi
CONF_FILE=/etc/systemd/system/kubelet.service
cat > $CONF_FILE <<EOF
@ -34,7 +36,7 @@ write_files:
--register-schedulable=false \
--allow-privileged=true \
--config=/etc/kubernetes/manifests \
--hostname-override=${myip} \
--hostname-override=${KUBE_NODE_IP} \
--logtostderr=true \
--v=0
Restart=always

View File

@ -21,7 +21,9 @@ write_files:
content: |
#!/bin/sh
myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
if [ -z "${KUBE_NODE_IP}" ]; then
KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
fi
TLS_CERT_FILE=${KUBE_CERTS_PATH}/worker.pem
TLS_PRIVATE_KEY_FILE=${KUBE_CERTS_PATH}/worker-key.pem
@ -45,7 +47,7 @@ write_files:
--register-node=true \
--allow-privileged=true \
--config=/etc/kubernetes/manifests \
--hostname-override=${myip} \
--hostname-override=${KUBE_NODE_IP} \
--logtostderr=true \
--v=0 \
--cadvisor-port=4194 \

View File

@ -25,7 +25,10 @@ write_files:
exit 0
fi
myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
if [ -z "${KUBE_NODE_IP}" ]; then
KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
fi
ETCD_SERVER_IP=${ETCD_SERVER_IP:-127.0.0.1}
PROTOCOL=https
@ -37,7 +40,7 @@ write_files:
ENV_FILE=/etc/flannel/options.env
mkdir -p $(dirname $ENV_FILE)
cat > $ENV_FILE <<EOF
FLANNELD_IFACE=$myip
FLANNELD_IFACE=${KUBE_NODE_IP}
FLANNELD_ETCD_ENDPOINTS=${PROTOCOL}://${ETCD_SERVER_IP}:2379
EOF

View File

@ -25,7 +25,10 @@ write_files:
exit 0
fi
myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
if [ -z "${KUBE_NODE_IP}" ]; then
KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
fi
ETCD_SERVER_IP=${ETCD_SERVER_IP:-127.0.0.1}
PROTOCOL=https
@ -37,7 +40,7 @@ write_files:
ENV_FILE=/etc/flannel/options.env
mkdir -p $(dirname $ENV_FILE)
cat > $ENV_FILE <<EOF
FLANNELD_IFACE=$myip
FLANNELD_IFACE=${KUBE_NODE_IP}
FLANNELD_ETCD_ENDPOINTS=${PROTOCOL}://${ETCD_SERVER_IP}:2379
EOF