github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16842 from ZJU-SEL/ubuntu-refactor

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-09 12:22:18 -08:00
commit 67254c6070
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cluster/ubuntu/util.sh
View File

@ -38,7 +38,7 @@ function setClusterInfo() {
# Such as, you will have NODE_IPS=192.168.0.2,192.168.0.3,192.168.0.2,192.168.0.3 which is obviously wrong # Such as, you will have NODE_IPS=192.168.0.2,192.168.0.3,192.168.0.2,192.168.0.3 which is obviously wrong
NODE_IPS="" NODE_IPS=""
ii=0 local ii=0
for i in $nodes; do for i in $nodes; do
nodeIP=${i#*@} nodeIP=${i#*@}
@ -108,7 +108,7 @@ function trap-add {
} }
function verify-cluster { function verify-cluster {
ii=0 local ii=0
for i in ${nodes} for i in ${nodes}
do do
@ -283,7 +283,7 @@ function detect-nodes {
KUBE_NODE_IP_ADDRESSES=() KUBE_NODE_IP_ADDRESSES=()
setClusterInfo setClusterInfo
ii=0 local ii=0
for i in ${nodes} for i in ${nodes}
do do
if [ "${roles[${ii}]}" == "i" ] || [ "${roles[${ii}]}" == "ai" ]; then if [ "${roles[${ii}]}" == "i" ] || [ "${roles[${ii}]}" == "ai" ]; then
@ -310,7 +310,7 @@ function kube-up() {
fi fi
setClusterInfo setClusterInfo
ii=0 local ii=0
for i in ${nodes} for i in ${nodes}
do do
@ -420,7 +420,7 @@ function kube-down {
source "${KUBE_ROOT}/cluster/common.sh" source "${KUBE_ROOT}/cluster/common.sh"
tear_down_alive_resources tear_down_alive_resources
ii=0 local ii=0
for i in ${nodes}; do for i in ${nodes}; do
{ {
echo "Cleaning on node ${i#*@}" echo "Cleaning on node ${i#*@}"
@ -473,7 +473,7 @@ function push-master {
export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl" export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl"
setClusterInfo setClusterInfo
ii=0 local ii=0
for i in ${nodes}; do for i in ${nodes}; do
if [[ "${roles[${ii}]}" == "a" ]]; then if [[ "${roles[${ii}]}" == "a" ]]; then
echo "Cleaning master ${i#*@}" echo "Cleaning master ${i#*@}"
@ -515,10 +515,13 @@ function push-node() {
fi fi
export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl" export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl"
node_ip=${1} local node_ip=${1}
setClusterInfo setClusterInfo
ii=0
existing=false local ii=0
local localexisting=false
for i in ${nodes}; do for i in ${nodes}; do
if [[ "${roles[${ii}]}" == "i" && ${i#*@} == $node_ip ]]; then if [[ "${roles[${ii}]}" == "i" && ${i#*@} == $node_ip ]]; then
echo "Cleaning node ${i#*@}" echo "Cleaning node ${i#*@}"
@ -561,7 +564,7 @@ function kube-push {
export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl" export KUBECTL_PATH="${KUBE_ROOT}/cluster/ubuntu/binaries/kubectl"
#stop all the kube's process & etcd #stop all the kube's process & etcd
ii=0 local ii=0
for i in ${nodes}; do for i in ${nodes}; do
{ {
echo "Cleaning on node ${i#*@}" echo "Cleaning on node ${i#*@}"
@ -584,7 +587,7 @@ function kube-push {
#provision all nodes,including master & nodes #provision all nodes,including master & nodes
setClusterInfo setClusterInfo
ii=0 local ii=0
for i in ${nodes}; do for i in ${nodes}; do
if [[ "${roles[${ii}]}" == "a" ]]; then if [[ "${roles[${ii}]}" == "a" ]]; then
provision-master provision-master