diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 0aa6e0b232b..fe365f59193 100755 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -186,10 +186,10 @@ function query-running-minions () { } function find-running-minions () { - MINION_IDS=() + NODE_IDS=() MINION_NAMES=() for id in $(query-running-minions "Reservations[].Instances[].InstanceId"); do - MINION_IDS+=("${id}") + NODE_IDS+=("${id}") # We use the minion ids as the name MINION_NAMES+=("${id}") @@ -199,7 +199,7 @@ function find-running-minions () { function detect-minions () { find-running-minions - # This is inefficient, but we want MINION_NAMES / MINION_IDS to be ordered the same as KUBE_NODE_IP_ADDRESSES + # This is inefficient, but we want MINION_NAMES / NODE_IDS to be ordered the same as KUBE_NODE_IP_ADDRESSES KUBE_NODE_IP_ADDRESSES=() for (( i=0; i<${#MINION_NAMES[@]}; i++)); do local minion_ip @@ -1022,8 +1022,8 @@ function start-minions() { attempt=0 while true; do find-running-minions > $LOG - if [[ ${#MINION_IDS[@]} == ${NUM_MINIONS} ]]; then - echo -e " ${color_green}${#MINION_IDS[@]} minions started; ready${color_norm}" + if [[ ${#NODE_IDS[@]} == ${NUM_MINIONS} ]]; then + echo -e " ${color_green}${#NODE_IDS[@]} minions started; ready${color_norm}" break fi @@ -1037,7 +1037,7 @@ function start-minions() { exit 1 fi - echo -e " ${color_yellow}${#MINION_IDS[@]} minions started; waiting${color_norm}" + echo -e " ${color_yellow}${#NODE_IDS[@]} minions started; waiting${color_norm}" attempt=$(($attempt+1)) sleep 10 done diff --git a/cluster/centos/node/scripts/kubelet.sh b/cluster/centos/node/scripts/kubelet.sh index 6491aa468fa..71d780d5433 100755 --- a/cluster/centos/node/scripts/kubelet.sh +++ b/cluster/centos/node/scripts/kubelet.sh @@ -33,7 +33,7 @@ NODE_ADDRESS="--address=${NODE_ADDRESS}" MINION_PORT="--port=10250" # --hostname-override="": If non-empty, will use this string as identification instead of the actual hostname. -MINION_HOSTNAME="--hostname-override=${NODE_ADDRESS}" +NODE_HOSTNAME="--hostname-override=${NODE_ADDRESS}" # --api-servers=[]: List of Kubernetes API servers for publishing events, # and reading pods and services. (ip:port), comma separated. @@ -50,7 +50,7 @@ KUBE_PROXY_OPTS=" \${KUBE_LOGTOSTDERR} \\ \${KUBE_LOG_LEVEL} \\ \${NODE_ADDRESS} \\ \${MINION_PORT} \\ - \${MINION_HOSTNAME} \\ + \${NODE_HOSTNAME} \\ \${KUBELET_API_SERVER} \\ \${KUBE_ALLOW_PRIV} \\ \${KUBELET_ARGS}" diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index c641ccec5f1..84478c4375d 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -23,16 +23,16 @@ MINION_SIZE=${MINION_SIZE:-n1-standard-2} NUM_MINIONS=${NUM_MINIONS:-3} MASTER_DISK_TYPE=pd-ssd MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB} -MINION_DISK_TYPE=${MINION_DISK_TYPE:-pd-standard} -MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} +NODE_DISK_TYPE=${NODE_DISK_TYPE:-pd-standard} +NODE_DISK_SIZE=${NODE_DISK_SIZE:-100GB} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true} PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} -MINION_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} -MINION_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} +NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} +NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index ca2e015af86..f981334a7e9 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -23,8 +23,8 @@ MINION_SIZE=${MINION_SIZE:-n1-standard-2} NUM_MINIONS=${NUM_MINIONS:-3} MASTER_DISK_TYPE=pd-ssd MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB} -MINION_DISK_TYPE=${MINION_DISK_TYPE:-pd-standard} -MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} +NODE_DISK_TYPE=${NODE_DISK_TYPE:-pd-standard} +NODE_DISK_SIZE=${NODE_DISK_SIZE:-100GB} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false} KUBE_APISERVER_REQUEST_TIMEOUT=300 PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} @@ -32,8 +32,8 @@ PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} -MINION_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} -MINION_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} +NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} +NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5} diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 65595268b14..9845cbb64e0 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -378,10 +378,10 @@ function create-node-template { if ! gcloud compute instance-templates create "$template_name" \ --project "${PROJECT}" \ --machine-type "${MINION_SIZE}" \ - --boot-disk-type "${MINION_DISK_TYPE}" \ - --boot-disk-size "${MINION_DISK_SIZE}" \ - --image-project="${MINION_IMAGE_PROJECT}" \ - --image "${MINION_IMAGE}" \ + --boot-disk-type "${NODE_DISK_TYPE}" \ + --boot-disk-size "${NODE_DISK_SIZE}" \ + --image-project="${NODE_IMAGE_PROJECT}" \ + --image "${NODE_IMAGE}" \ --tags "${MINION_TAG}" \ --network "${NETWORK}" \ ${preemptible_minions} \ diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh index a4ed79fced8..b6085138ec1 100644 --- a/cluster/vagrant/util.sh +++ b/cluster/vagrant/util.sh @@ -172,7 +172,7 @@ function create-provision-scripts { echo "MINION_NAME=(${MINION_NAMES[$i]})" echo "MINION_IPS=(${MINION_IPS[@]})" echo "MINION_IP='${MINION_IPS[$i]}'" - echo "MINION_ID='$i'" + echo "NODE_ID='$i'" echo "NODE_IP='${MINION_IPS[$i]}'" echo "MASTER_CONTAINER_SUBNET='${MASTER_CONTAINER_SUBNET}'" echo "CONTAINER_ADDR='${NODE_CONTAINER_ADDRS[$i]}'" diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index e1559d0e926..017cdffd37a 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -431,7 +431,7 @@ case ${JOB_NAME} in # Override GCE defaults. MASTER_SIZE="n1-standard-4" MINION_SIZE="n1-standard-2" - MINION_DISK_SIZE="50GB" + NODE_DISK_SIZE="50GB" NUM_MINIONS="100" # Reduce logs verbosity TEST_CLUSTER_LOG_LEVEL="--v=2" @@ -453,7 +453,7 @@ case ${JOB_NAME} in E2E_ZONE="us-east1-b" MASTER_SIZE="n1-standard-4" MINION_SIZE="n1-standard-2" - MINION_DISK_SIZE="50GB" + NODE_DISK_SIZE="50GB" NUM_MINIONS="100" # Reduce logs verbosity TEST_CLUSTER_LOG_LEVEL="--v=2" @@ -1501,7 +1501,7 @@ export KUBE_ENABLE_DEPLOYMENTS=${ENABLE_DEPLOYMENTS:-} export KUBE_ENABLE_EXPERIMENTAL_API=${ENABLE_EXPERIMENTAL_API:-} export MASTER_SIZE=${MASTER_SIZE:-} export MINION_SIZE=${MINION_SIZE:-} -export MINION_DISK_SIZE=${MINION_DISK_SIZE:-} +export NODE_DISK_SIZE=${NODE_DISK_SIZE:-} export NUM_MINIONS=${NUM_MINIONS:-} export TEST_CLUSTER_LOG_LEVEL=${TEST_CLUSTER_LOG_LEVEL:-} export TEST_CLUSTER_RESYNC_PERIOD=${TEST_CLUSTER_RESYNC_PERIOD:-}