Minion->Node rename: NODE_SIZE

2025-09-06 11:42:14 +00:00 · 2015-11-23 19:05:51 -08:00
parent 8431993a44
commit bd06c19aa8
9 changed files with 27 additions and 27 deletions
--- a/cluster/aws/config-default.sh
+++ b/cluster/aws/config-default.sh
@@ -16,17 +16,17 @@

 ZONE=${KUBE_AWS_ZONE:-us-west-2a}
 MASTER_SIZE=${MASTER_SIZE:-}
-MINION_SIZE=${MINION_SIZE:-}
+NODE_SIZE=${NODE_SIZE:-}
 NUM_MINIONS=${NUM_MINIONS:-4}

 # Dynamically set node sizes so that Heapster has enough space to run
-if [[ -z ${MINION_SIZE} ]]; then
+if [[ -z ${NODE_SIZE} ]]; then
  if (( ${NUM_MINIONS} < 50 )); then
-    MINION_SIZE="t2.micro"
+    NODE_SIZE="t2.micro"
  elif (( ${NUM_MINIONS} < 150 )); then
-    MINION_SIZE="t2.small"
+    NODE_SIZE="t2.small"
  else
-    MINION_SIZE="t2.medium"
+    NODE_SIZE="t2.medium"
  fi
 fi

--- a/cluster/aws/config-test.sh
+++ b/cluster/aws/config-test.sh
@@ -17,17 +17,17 @@
 ZONE=${KUBE_AWS_ZONE:-us-west-2a}

 MASTER_SIZE=${MASTER_SIZE:-}
-MINION_SIZE=${MINION_SIZE:-}
+NODE_SIZE=${NODE_SIZE:-}
 NUM_MINIONS=${NUM_MINIONS:-2}

 # Dynamically set node sizes so that Heapster has enough space to run
-if [[ -z ${MINION_SIZE} ]]; then
+if [[ -z ${NODE_SIZE} ]]; then
  if (( ${NUM_MINIONS} < 50 )); then
-    MINION_SIZE="t2.micro"
+    NODE_SIZE="t2.micro"
  elif (( ${NUM_MINIONS} < 150 )); then
-    MINION_SIZE="t2.small"
+    NODE_SIZE="t2.small"
  else
-    MINION_SIZE="t2.medium"
+    NODE_SIZE="t2.medium"
  fi
 fi

--- a/cluster/aws/options.md
+++ b/cluster/aws/options.md
@@ -27,7 +27,7 @@ It is not a bad idea to set AWS_S3_BUCKET to something more human friendly.

 AWS_S3_REGION is useful for people that want to control their data location, because of regulatory restrictions for example.

-**MASTER_SIZE**, **MINION_SIZE**
+**MASTER_SIZE**, **NODE_SIZE**

 The instance type to use for creating the master/minion.  Defaults to auto-sizing based on the number of nodes (see below).

@@ -35,7 +35,7 @@ For production usage, we recommend bigger instances, for example:

 ```
 export MASTER_SIZE=c4.large
-export MINION_SIZE=r3.large
+export NODE_SIZE=r3.large
 ```

 If you don't specify master and minion sizes, the scripts will attempt to guess the correct size of the master and worker nodes based on `${NUM_MINIONS}`.
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -999,7 +999,7 @@ function start-minions() {
      --launch-configuration-name ${ASG_NAME} \
      --image-id $KUBE_NODE_IMAGE \
      --iam-instance-profile ${IAM_PROFILE_NODE} \
-      --instance-type $MINION_SIZE \
+      --instance-type $NODE_SIZE \
      --key-name ${AWS_SSH_KEY_NAME} \
      --security-groups ${NODE_SG_ID} \
      ${public_ip_option} \
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -19,7 +19,7 @@
 GCLOUD=gcloud
 ZONE=${KUBE_GCE_ZONE:-us-central1-b}
 MASTER_SIZE=${MASTER_SIZE:-n1-standard-2}
-MINION_SIZE=${MINION_SIZE:-n1-standard-2}
+NODE_SIZE=${NODE_SIZE:-n1-standard-2}
 NUM_MINIONS=${NUM_MINIONS:-3}
 MASTER_DISK_TYPE=pd-ssd
 MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -19,7 +19,7 @@
 GCLOUD=gcloud
 ZONE=${KUBE_GCE_ZONE:-us-central1-b}
 MASTER_SIZE=${MASTER_SIZE:-n1-standard-2}
-MINION_SIZE=${MINION_SIZE:-n1-standard-2}
+NODE_SIZE=${NODE_SIZE:-n1-standard-2}
 NUM_MINIONS=${NUM_MINIONS:-3}
 MASTER_DISK_TYPE=pd-ssd
 MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -377,7 +377,7 @@ function create-node-template {
    echo "Attempt ${attempt} to create ${1}" >&2
    if ! gcloud compute instance-templates create "$template_name" \
      --project "${PROJECT}" \
-      --machine-type "${MINION_SIZE}" \
+      --machine-type "${NODE_SIZE}" \
      --boot-disk-type "${NODE_DISK_TYPE}" \
      --boot-disk-size "${NODE_DISK_SIZE}" \
      --image-project="${NODE_IMAGE_PROJECT}" \
--- a/docs/getting-started-guides/aws.md
+++ b/docs/getting-started-guides/aws.md
@@ -84,7 +84,7 @@ You can override the variables defined in [config-default.sh](http://releases.k8
 ```bash
 export KUBE_AWS_ZONE=eu-west-1c
 export NUM_MINIONS=2
-export MINION_SIZE=m3.medium
+export NODE_SIZE=m3.medium
 export AWS_S3_REGION=eu-west-1
 export AWS_S3_BUCKET=mycompany-kubernetes-artifacts
 export INSTANCE_PREFIX=k8s
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -106,7 +106,7 @@ if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Performance\]"}
  else
    : ${MASTER_SIZE:="m3.large"}
-    : ${MINION_SIZE:="m3.large"}
+    : ${NODE_SIZE:="m3.large"}
    : ${NUM_MINIONS:="3"}
  fi
 fi
@@ -430,7 +430,7 @@ case ${JOB_NAME} in
    : ${PROJECT:="kubernetes-jenkins"}
    # Override GCE defaults.
    MASTER_SIZE="n1-standard-4"
-    MINION_SIZE="n1-standard-2"
+    NODE_SIZE="n1-standard-2"
    NODE_DISK_SIZE="50GB"
    NUM_MINIONS="100"
    # Reduce logs verbosity
@@ -452,7 +452,7 @@ case ${JOB_NAME} in
    # Override GCE defaults.
    E2E_ZONE="us-east1-b"
    MASTER_SIZE="n1-standard-4"
-    MINION_SIZE="n1-standard-2"
+    NODE_SIZE="n1-standard-2"
    NODE_DISK_SIZE="50GB"
    NUM_MINIONS="100"
    # Reduce logs verbosity
@@ -793,7 +793,7 @@ case ${JOB_NAME} in
    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=GCE\sL7\sLoadBalancer\sController|Job|Horizontal\spod\sautoscaling"}
    # At least n1-standard-2 nodes are required for the cluster to
    # have enough cpu/ram to run the Horizontal pod autoscaling tests.
-    MINION_SIZE="n1-standard-2"
+    NODE_SIZE="n1-standard-2"
    ;;

  # Sets up the GKE soak cluster weekly using the latest CI release.
@@ -808,7 +808,7 @@ case ${JOB_NAME} in
    : ${E2E_UP:="true"}
    : ${PROJECT:="kubernetes-jenkins"}
    # Need at least n1-standard-2 nodes to run kubelet_perf tests
-    MINION_SIZE="n1-standard-2"
+    NODE_SIZE="n1-standard-2"
    ;;

  # Runs tests on GKE soak cluster.
@@ -1417,7 +1417,7 @@ case ${JOB_NAME} in
    KUBE_GCE_INSTANCE_PREFIX="kubemark100"
    NUM_MINIONS="10"
    MASTER_SIZE="n1-standard-2"
-    MINION_SIZE="n1-standard-1"
+    NODE_SIZE="n1-standard-1"
    KUBEMARK_MASTER_SIZE="n1-standard-4"
    KUBEMARK_NUM_NODES="100"
    ;;
@@ -1435,7 +1435,7 @@ case ${JOB_NAME} in
    # Override defaults to be indpendent from GCE defaults and set kubemark parameters
    NUM_MINIONS="6"
    MASTER_SIZE="n1-standard-4"
-    MINION_SIZE="n1-standard-8"
+    NODE_SIZE="n1-standard-8"
    KUBE_GCE_INSTANCE_PREFIX="kubemark500"
    E2E_ZONE="asia-east1-a"
    KUBEMARK_MASTER_SIZE="n1-standard-16"
@@ -1455,7 +1455,7 @@ case ${JOB_NAME} in
    # We need 11 so that we won't hit max-pods limit (set to 100). TODO: do it in a nicer way.
    NUM_MINIONS="11"
    MASTER_SIZE="n1-standard-4"
-    MINION_SIZE="n1-standard-8"   # Note: can fit about 17 hollow nodes per core
+    NODE_SIZE="n1-standard-8"   # Note: can fit about 17 hollow nodes per core
    #                                     so NUM_MINIONS x cores_per_minion should
    #                                     be set accordingly.
    KUBE_GCE_INSTANCE_PREFIX="kubemark1000"
@@ -1486,7 +1486,7 @@ export KUBE_GKE_NETWORK=${E2E_NETWORK}
 export E2E_SET_CLUSTER_API_VERSION=${E2E_SET_CLUSTER_API_VERSION:-}
 export DOGFOOD_GCLOUD=${DOGFOOD_GCLOUD:-}
 export CMD_GROUP=${CMD_GROUP:-}
-export MACHINE_TYPE=${MINION_SIZE:-}  # GKE scripts use MACHINE_TYPE for the node vm size
+export MACHINE_TYPE=${NODE_SIZE:-}  # GKE scripts use MACHINE_TYPE for the node vm size

 if [[ ! -z "${GKE_API_ENDPOINT:-}" ]]; then
  export CLOUDSDK_API_ENDPOINT_OVERRIDES_CONTAINER=${GKE_API_ENDPOINT}
@@ -1500,7 +1500,7 @@ export KUBE_ENABLE_HORIZONTAL_POD_AUTOSCALER=${ENABLE_HORIZONTAL_POD_AUTOSCALER:
 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 NODE_SIZE=${NODE_SIZE:-}
 export NODE_DISK_SIZE=${NODE_DISK_SIZE:-}
 export NUM_MINIONS=${NUM_MINIONS:-}
 export TEST_CLUSTER_LOG_LEVEL=${TEST_CLUSTER_LOG_LEVEL:-}