diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 5a74d1e4a19..5e78219c77f 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -66,13 +66,13 @@ MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20} MASTER_ROOT_DISK_TYPE="${MASTER_ROOT_DISK_TYPE:-gp2}" MASTER_ROOT_DISK_SIZE=${MASTER_ROOT_DISK_SIZE:-8} # The minions root EBS volume size (used to house Docker images) -MINION_ROOT_DISK_TYPE="${MINION_ROOT_DISK_TYPE:-gp2}" -MINION_ROOT_DISK_SIZE=${MINION_ROOT_DISK_SIZE:-32} +NODE_ROOT_DISK_TYPE="${NODE_ROOT_DISK_TYPE:-gp2}" +NODE_ROOT_DISK_SIZE=${NODE_ROOT_DISK_SIZE:-32} MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_TAG="${INSTANCE_PREFIX}-master" MINION_TAG="${INSTANCE_PREFIX}-minion" -MINION_SCOPES="" +NODE_SCOPES="" POLL_SLEEP_INTERVAL=3 SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}" diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 11d164d87ea..5bb475f6162 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -64,13 +64,13 @@ MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20} MASTER_ROOT_DISK_TYPE="${MASTER_ROOT_DISK_TYPE:-gp2}" MASTER_ROOT_DISK_SIZE=${MASTER_ROOT_DISK_SIZE:-8} # The minions root EBS volume size (used to house Docker images) -MINION_ROOT_DISK_TYPE="${MINION_ROOT_DISK_TYPE:-gp2}" -MINION_ROOT_DISK_SIZE=${MINION_ROOT_DISK_SIZE:-32} +NODE_ROOT_DISK_TYPE="${NODE_ROOT_DISK_TYPE:-gp2}" +NODE_ROOT_DISK_SIZE=${NODE_ROOT_DISK_SIZE:-32} MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_TAG="${INSTANCE_PREFIX}-master" MINION_TAG="${INSTANCE_PREFIX}-minion" -MINION_SCOPES="" +NODE_SCOPES="" POLL_SLEEP_INTERVAL=3 SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.245.0.0/16}" diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 1a381f63287..08b0035b7e9 100755 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -86,7 +86,7 @@ MINION_SG_NAME="kubernetes-minion-${CLUSTER_ID}" # only affects the big storage instance types, which aren't a typical use case right now. BLOCK_DEVICE_MAPPINGS_BASE="{\"DeviceName\": \"/dev/sdc\",\"VirtualName\":\"ephemeral0\"},{\"DeviceName\": \"/dev/sdd\",\"VirtualName\":\"ephemeral1\"},{\"DeviceName\": \"/dev/sde\",\"VirtualName\":\"ephemeral2\"},{\"DeviceName\": \"/dev/sdf\",\"VirtualName\":\"ephemeral3\"}" MASTER_BLOCK_DEVICE_MAPPINGS="[{\"DeviceName\":\"/dev/sda1\",\"Ebs\":{\"DeleteOnTermination\":true,\"VolumeSize\":${MASTER_ROOT_DISK_SIZE},\"VolumeType\":\"${MASTER_ROOT_DISK_TYPE}\"}}, ${BLOCK_DEVICE_MAPPINGS_BASE}]" -NODE_BLOCK_DEVICE_MAPPINGS="[{\"DeviceName\":\"/dev/sda1\",\"Ebs\":{\"DeleteOnTermination\":true,\"VolumeSize\":${MINION_ROOT_DISK_SIZE},\"VolumeType\":\"${MINION_ROOT_DISK_TYPE}\"}}, ${BLOCK_DEVICE_MAPPINGS_BASE}]" +NODE_BLOCK_DEVICE_MAPPINGS="[{\"DeviceName\":\"/dev/sda1\",\"Ebs\":{\"DeleteOnTermination\":true,\"VolumeSize\":${NODE_ROOT_DISK_SIZE},\"VolumeType\":\"${NODE_ROOT_DISK_TYPE}\"}}, ${BLOCK_DEVICE_MAPPINGS_BASE}]" # TODO (bburns) Parameterize this for multiple cluster per project diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 84478c4375d..5fb089e06ba 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -43,7 +43,7 @@ MASTER_TAG="${INSTANCE_PREFIX}-master" MINION_TAG="${INSTANCE_PREFIX}-minion" MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}" -MINION_SCOPES="${MINION_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}" +NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}" # Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default. POLL_SLEEP_INTERVAL="${POLL_SLEEP_INTERVAL:-3}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index f981334a7e9..957214fb744 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -44,7 +44,7 @@ MASTER_TAG="${INSTANCE_PREFIX}-master" MINION_TAG="${INSTANCE_PREFIX}-minion" CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.245.0.0/16}" MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" -MINION_SCOPES="${MINION_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}" +NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}" RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}" TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} diff --git a/cluster/gce/upgrade.sh b/cluster/gce/upgrade.sh index bed8a8beb9c..fa6839eb71b 100755 --- a/cluster/gce/upgrade.sh +++ b/cluster/gce/upgrade.sh @@ -145,7 +145,7 @@ function get-env-val() { # Assumed vars: # KUBE_VERSION -# MINION_SCOPES +# NODE_SCOPES # NODE_INSTANCE_PREFIX # PROJECT # ZONE @@ -167,7 +167,7 @@ function upgrade-nodes() { # # Assumed vars: # KUBE_VERSION -# MINION_SCOPES +# NODE_SCOPES # NODE_INSTANCE_PREFIX # PROJECT # ZONE @@ -188,8 +188,8 @@ function prepare-node-upgrade() { # TODO(zmerlynn): Refactor setting scope flags. local scope_flags= - if [ -n "${MINION_SCOPES}" ]; then - scope_flags="--scopes ${MINION_SCOPES}" + if [ -n "${NODE_SCOPES}" ]; then + scope_flags="--scopes ${NODE_SCOPES}" else scope_flags="--no-scopes" fi diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index a0af03d95da..9ef3184e350 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -663,8 +663,8 @@ function kube-up { # TODO(zmerlynn): Refactor setting scope flags. local scope_flags= - if [ -n "${MINION_SCOPES}" ]; then - scope_flags="--scopes ${MINION_SCOPES}" + if [ -n "${NODE_SCOPES}" ]; then + scope_flags="--scopes ${NODE_SCOPES}" else scope_flags="--no-scopes" fi @@ -1040,8 +1040,8 @@ function prepare-push() { # TODO(zmerlynn): Refactor setting scope flags. local scope_flags= - if [ -n "${MINION_SCOPES}" ]; then - scope_flags="--scopes ${MINION_SCOPES}" + if [ -n "${NODE_SCOPES}" ]; then + scope_flags="--scopes ${NODE_SCOPES}" else scope_flags="--no-scopes" fi diff --git a/cluster/gke/config-common.sh b/cluster/gke/config-common.sh index c46604165bb..4d1aa16088e 100644 --- a/cluster/gke/config-common.sh +++ b/cluster/gke/config-common.sh @@ -27,7 +27,7 @@ FIREWALL_SSH="${FIREWALL_SSH:-${NETWORK}-allow-ssh}" GCLOUD="${GCLOUD:-gcloud}" CMD_GROUP="${CMD_GROUP:-}" GCLOUD_CONFIG_DIR="${GCLOUD_CONFIG_DIR:-${HOME}/.config/gcloud/kubernetes}" -MINION_SCOPES="${MINION_SCOPES:-"compute-rw,storage-ro"}" +NODE_SCOPES="${NODE_SCOPES:-"compute-rw,storage-ro"}" MACHINE_TYPE="${MACHINE_TYPE:-n1-standard-2}" # WARNING: any new vars added here must correspond to options that can be diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh index 9a0f127f371..c4d12da6283 100755 --- a/cluster/gke/util.sh +++ b/cluster/gke/util.sh @@ -113,7 +113,7 @@ function verify-prereqs() { # ZONE # CLUSTER_API_VERSION (optional) # NUM_MINIONS -# MINION_SCOPES +# NODE_SCOPES # MACHINE_TYPE function kube-up() { echo "... in gke:kube-up()" >&2 @@ -145,7 +145,7 @@ function kube-up() { "--project=${PROJECT}" "--num-nodes=${NUM_MINIONS}" "--network=${NETWORK}" - "--scopes=${MINION_SCOPES}" + "--scopes=${NODE_SCOPES}" "--cluster-version=${CLUSTER_API_VERSION}" "--machine-type=${MACHINE_TYPE}" )