github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17615 from hpcloud/source-config-default

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-10 05:14:02 -08:00
commit 184171c583
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/ubuntu/config-default.sh
View File

@ -71,3 +71,5 @@ ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}"
# Add envitonment variable separated with blank space like "http_proxy=http://10.x.x.x:8080 https_proxy=https://10.x.x.x:8443" # Add envitonment variable separated with blank space like "http_proxy=http://10.x.x.x:8080 https_proxy=https://10.x.x.x:8443"
PROXY_SETTING=${PROXY_SETTING:-""} PROXY_SETTING=${PROXY_SETTING:-""}
DEBUG=${DEBUG:-"false"}

6
cluster/ubuntu/reconfDocker.sh
View File

@ -16,6 +16,8 @@
# reconfigure docker network setting # reconfigure docker network setting
source ~/kube/config-default.sh
if [ "$(id -u)" != "0" ]; then if [ "$(id -u)" != "0" ]; then
echo >&2 "Please run as root" echo >&2 "Please run as root"
exit 1 exit 1
@ -23,9 +25,6 @@ fi
function config_etcd { function config_etcd {
source ~/kube/config-default.sh
attempt=0 attempt=0
while true; do while true; do
/opt/bin/etcdctl get /coreos.com/network/config /opt/bin/etcdctl get /coreos.com/network/config
@ -46,7 +45,6 @@ function config_etcd {
} }
function restart_docker { function restart_docker {
attempt=0 attempt=0
while [[ ! -f /run/flannel/subnet.env ]]; do while [[ ! -f /run/flannel/subnet.env ]]; do
if (( attempt > 200 )); then if (( attempt > 200 )); then

31
cluster/ubuntu/util.sh
View File

@ -373,8 +373,15 @@ function provision-master() {
EXTRA_SANS=$(echo "${EXTRA_SANS[@]}" | tr ' ' ,) EXTRA_SANS=$(echo "${EXTRA_SANS[@]}" | tr ' ' ,)
BASH_DEBUG_FLAGS=""
if [[ "$DEBUG" == "true" ]] ; then
BASH_DEBUG_FLAGS="set -x"
fi
# remote login to MASTER and configue k8s master # remote login to MASTER and configue k8s master
ssh $SSH_OPTS -t "${MASTER}" " ssh $SSH_OPTS -t "${MASTER}" "
set +e
${BASH_DEBUG_FLAGS}
source ~/kube/util.sh source ~/kube/util.sh
setClusterInfo setClusterInfo
@ -387,7 +394,9 @@ function provision-master() {
create-kube-controller-manager-opts '${NODE_IPS}' create-kube-controller-manager-opts '${NODE_IPS}'
create-kube-scheduler-opts create-kube-scheduler-opts
create-flanneld-opts '127.0.0.1' '${MASTER_IP}' create-flanneld-opts '127.0.0.1' '${MASTER_IP}'
sudo -E -p '[sudo] password to start master: ' -- /bin/bash -c ' sudo -E -p '[sudo] password to start master: ' -- /bin/bash -ce '
${BASH_DEBUG_FLAGS}
cp ~/kube/default/* /etc/default/ cp ~/kube/default/* /etc/default/
cp ~/kube/init_conf/* /etc/init/ cp ~/kube/init_conf/* /etc/init/
cp ~/kube/init_scripts/* /etc/init.d/ cp ~/kube/init_scripts/* /etc/init.d/
@ -419,8 +428,15 @@ function provision-node() {
ubuntu/binaries/minion \ ubuntu/binaries/minion \
"${1}:~/kube" "${1}:~/kube"
BASH_DEBUG_FLAGS=""
if [[ "$DEBUG" == "true" ]] ; then
BASH_DEBUG_FLAGS="set -x"
fi
# remote login to node and configue k8s node # remote login to node and configue k8s node
ssh $SSH_OPTS -t "$1" " ssh $SSH_OPTS -t "$1" "
set +e
${BASH_DEBUG_FLAGS}
source ~/kube/util.sh source ~/kube/util.sh
setClusterInfo setClusterInfo
@ -434,7 +450,8 @@ function provision-node() {
'${MASTER_IP}' '${MASTER_IP}'
create-flanneld-opts '${MASTER_IP}' '${1#*@}' create-flanneld-opts '${MASTER_IP}' '${1#*@}'
sudo -E -p '[sudo] password to start node: ' -- /bin/bash -c ' sudo -E -p '[sudo] password to start node: ' -- /bin/bash -ce '
${BASH_DEBUG_FLAGS}
cp ~/kube/default/* /etc/default/ cp ~/kube/default/* /etc/default/
cp ~/kube/init_conf/* /etc/init/ cp ~/kube/init_conf/* /etc/init/
cp ~/kube/init_scripts/* /etc/init.d/ cp ~/kube/init_scripts/* /etc/init.d/
@ -478,8 +495,15 @@ function provision-masterandnode() {
EXTRA_SANS=$(echo "${EXTRA_SANS[@]}" | tr ' ' ,) EXTRA_SANS=$(echo "${EXTRA_SANS[@]}" | tr ' ' ,)
BASH_DEBUG_FLAGS=""
if [[ "$DEBUG" == "true" ]] ; then
BASH_DEBUG_FLAGS="set -x"
fi
# remote login to the master/node and configue k8s # remote login to the master/node and configue k8s
ssh $SSH_OPTS -t "$MASTER" " ssh $SSH_OPTS -t "$MASTER" "
set +e
${BASH_DEBUG_FLAGS}
source ~/kube/util.sh source ~/kube/util.sh
setClusterInfo setClusterInfo
@ -501,7 +525,8 @@ function provision-masterandnode() {
'${MASTER_IP}' '${MASTER_IP}'
create-flanneld-opts '127.0.0.1' '${MASTER_IP}' create-flanneld-opts '127.0.0.1' '${MASTER_IP}'
sudo -E -p '[sudo] password to start master: ' -- /bin/bash -c ' sudo -E -p '[sudo] password to start master: ' -- /bin/bash -ce '
${BASH_DEBUG_FLAGS}
cp ~/kube/default/* /etc/default/ cp ~/kube/default/* /etc/default/
cp ~/kube/init_conf/* /etc/init/ cp ~/kube/init_conf/* /etc/init/
cp ~/kube/init_scripts/* /etc/init.d/ cp ~/kube/init_scripts/* /etc/init.d/