scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minion->Node rename: NODE_DISK_SIZE, NODE_DISK_TYPE, NODE_HOSTNAME, etc

Browse Source 
NODE_IDS
NODE_ID
NODE_IMAGE_PROJECT
NODE_IMAGE
This commit is contained in:
Brad Erickson
2015-11-23 19:02:38 -08:00
parent a36d3390bf
commit 83ed2fa22e
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/aws/util.sh
View File

@@ -186,10 +186,10 @@ function query-running-minions () {
} }
function find-running-minions () { function find-running-minions () {
MINION_IDS=() NODE_IDS=()
MINION_NAMES=() MINION_NAMES=()
for id in $(query-running-minions "Reservations[].Instances[].InstanceId"); do for id in $(query-running-minions "Reservations[].Instances[].InstanceId"); do
MINION_IDS+=("${id}") NODE_IDS+=("${id}")
# We use the minion ids as the name # We use the minion ids as the name
MINION_NAMES+=("${id}") MINION_NAMES+=("${id}")
@@ -199,7 +199,7 @@ function find-running-minions () {
function detect-minions () { function detect-minions () {
find-running-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=() KUBE_NODE_IP_ADDRESSES=()
for (( i=0; i<${#MINION_NAMES[@]}; i++)); do for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
local minion_ip local minion_ip
@@ -1022,8 +1022,8 @@ function start-minions() {
attempt=0 attempt=0
while true; do while true; do
find-running-minions > $LOG find-running-minions > $LOG
if [[ ${#MINION_IDS[@]} == ${NUM_MINIONS} ]]; then if [[ ${#NODE_IDS[@]} == ${NUM_MINIONS} ]]; then
echo -e " ${color_green}${#MINION_IDS[@]} minions started; ready${color_norm}" echo -e " ${color_green}${#NODE_IDS[@]} minions started; ready${color_norm}"
break break
fi fi
@@ -1037,7 +1037,7 @@ function start-minions() {
exit 1 exit 1
fi 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)) attempt=$(($attempt+1))
sleep 10 sleep 10
done done

4
cluster/centos/node/scripts/kubelet.sh
View File

@@ -33,7 +33,7 @@ NODE_ADDRESS="--address=${NODE_ADDRESS}"
MINION_PORT="--port=10250" MINION_PORT="--port=10250"
# --hostname-override="": If non-empty, will use this string as identification instead of the actual hostname. # --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, # --api-servers=[]: List of Kubernetes API servers for publishing events,
# and reading pods and services. (ip:port), comma separated. # and reading pods and services. (ip:port), comma separated.
@@ -50,7 +50,7 @@ KUBE_PROXY_OPTS=" \${KUBE_LOGTOSTDERR} \\
\${KUBE_LOG_LEVEL} \\ \${KUBE_LOG_LEVEL} \\
\${NODE_ADDRESS} \\ \${NODE_ADDRESS} \\
\${MINION_PORT} \\ \${MINION_PORT} \\
\${MINION_HOSTNAME} \\ \${NODE_HOSTNAME} \\
\${KUBELET_API_SERVER} \\ \${KUBELET_API_SERVER} \\
\${KUBE_ALLOW_PRIV} \\ \${KUBE_ALLOW_PRIV} \\
\${KUBELET_ARGS}" \${KUBELET_ARGS}"

8
cluster/gce/config-default.sh
View File

@@ -23,16 +23,16 @@ MINION_SIZE=${MINION_SIZE:-n1-standard-2}
NUM_MINIONS=${NUM_MINIONS:-3} NUM_MINIONS=${NUM_MINIONS:-3}
MASTER_DISK_TYPE=pd-ssd MASTER_DISK_TYPE=pd-ssd
MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB} MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
MINION_DISK_TYPE=${MINION_DISK_TYPE:-pd-standard} NODE_DISK_TYPE=${NODE_DISK_TYPE:-pd-standard}
MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} NODE_DISK_SIZE=${NODE_DISK_SIZE:-100GB}
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
MINION_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
MINION_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5} RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}

8
cluster/gce/config-test.sh
View File

@@ -23,8 +23,8 @@ MINION_SIZE=${MINION_SIZE:-n1-standard-2}
NUM_MINIONS=${NUM_MINIONS:-3} NUM_MINIONS=${NUM_MINIONS:-3}
MASTER_DISK_TYPE=pd-ssd MASTER_DISK_TYPE=pd-ssd
MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB} MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
MINION_DISK_TYPE=${MINION_DISK_TYPE:-pd-standard} NODE_DISK_TYPE=${NODE_DISK_TYPE:-pd-standard}
MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} NODE_DISK_SIZE=${NODE_DISK_SIZE:-100GB}
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
KUBE_APISERVER_REQUEST_TIMEOUT=300 KUBE_APISERVER_REQUEST_TIMEOUT=300
PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false}
@@ -32,8 +32,8 @@ PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
MINION_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
MINION_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5} RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}

8
cluster/gce/util.sh
View File

@@ -378,10 +378,10 @@ function create-node-template {
if ! gcloud compute instance-templates create "$template_name" \ if ! gcloud compute instance-templates create "$template_name" \
--project "${PROJECT}" \ --project "${PROJECT}" \
--machine-type "${MINION_SIZE}" \ --machine-type "${MINION_SIZE}" \
--boot-disk-type "${MINION_DISK_TYPE}" \ --boot-disk-type "${NODE_DISK_TYPE}" \
--boot-disk-size "${MINION_DISK_SIZE}" \ --boot-disk-size "${NODE_DISK_SIZE}" \
--image-project="${MINION_IMAGE_PROJECT}" \ --image-project="${NODE_IMAGE_PROJECT}" \
--image "${MINION_IMAGE}" \ --image "${NODE_IMAGE}" \
--tags "${MINION_TAG}" \ --tags "${MINION_TAG}" \
--network "${NETWORK}" \ --network "${NETWORK}" \
${preemptible_minions} \ ${preemptible_minions} \

2
cluster/vagrant/util.sh
View File

@@ -172,7 +172,7 @@ function create-provision-scripts {
echo "MINION_NAME=(${MINION_NAMES[$i]})" echo "MINION_NAME=(${MINION_NAMES[$i]})"
echo "MINION_IPS=(${MINION_IPS[@]})" echo "MINION_IPS=(${MINION_IPS[@]})"
echo "MINION_IP='${MINION_IPS[$i]}'" echo "MINION_IP='${MINION_IPS[$i]}'"
echo "MINION_ID='$i'" echo "NODE_ID='$i'"
echo "NODE_IP='${MINION_IPS[$i]}'" echo "NODE_IP='${MINION_IPS[$i]}'"
echo "MASTER_CONTAINER_SUBNET='${MASTER_CONTAINER_SUBNET}'" echo "MASTER_CONTAINER_SUBNET='${MASTER_CONTAINER_SUBNET}'"
echo "CONTAINER_ADDR='${NODE_CONTAINER_ADDRS[$i]}'" echo "CONTAINER_ADDR='${NODE_CONTAINER_ADDRS[$i]}'"

6
hack/jenkins/e2e.sh
View File

@@ -431,7 +431,7 @@ case ${JOB_NAME} in
# Override GCE defaults. # Override GCE defaults.
MASTER_SIZE="n1-standard-4" MASTER_SIZE="n1-standard-4"
MINION_SIZE="n1-standard-2" MINION_SIZE="n1-standard-2"
MINION_DISK_SIZE="50GB" NODE_DISK_SIZE="50GB"
NUM_MINIONS="100" NUM_MINIONS="100"
# Reduce logs verbosity # Reduce logs verbosity
TEST_CLUSTER_LOG_LEVEL="--v=2" TEST_CLUSTER_LOG_LEVEL="--v=2"
@@ -453,7 +453,7 @@ case ${JOB_NAME} in
E2E_ZONE="us-east1-b" E2E_ZONE="us-east1-b"
MASTER_SIZE="n1-standard-4" MASTER_SIZE="n1-standard-4"
MINION_SIZE="n1-standard-2" MINION_SIZE="n1-standard-2"
MINION_DISK_SIZE="50GB" NODE_DISK_SIZE="50GB"
NUM_MINIONS="100" NUM_MINIONS="100"
# Reduce logs verbosity # Reduce logs verbosity
TEST_CLUSTER_LOG_LEVEL="--v=2" 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 KUBE_ENABLE_EXPERIMENTAL_API=${ENABLE_EXPERIMENTAL_API:-}
export MASTER_SIZE=${MASTER_SIZE:-} export MASTER_SIZE=${MASTER_SIZE:-}
export MINION_SIZE=${MINION_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 NUM_MINIONS=${NUM_MINIONS:-}
export TEST_CLUSTER_LOG_LEVEL=${TEST_CLUSTER_LOG_LEVEL:-} export TEST_CLUSTER_LOG_LEVEL=${TEST_CLUSTER_LOG_LEVEL:-}
export TEST_CLUSTER_RESYNC_PERIOD=${TEST_CLUSTER_RESYNC_PERIOD:-} export TEST_CLUSTER_RESYNC_PERIOD=${TEST_CLUSTER_RESYNC_PERIOD:-}