From 6b91b45eff378b1da481cdf96cea8948a9787d28 Mon Sep 17 00:00:00 2001 From: Brad Erickson Date: Mon, 23 Nov 2015 18:59:56 -0800 Subject: [PATCH] Minion->Node rename: IAM_PROFILE_NODE, KUBE_ENABLE_NODE_PUBLIC_IP, etc KUBE_GCE_NODE_IMAGE, KUBE_GCE_NODE_PROJECT, KUBEMARK_NUM_NODES --- cluster/aws/config-default.sh | 4 ++-- cluster/aws/config-test.sh | 4 ++-- cluster/aws/options.md | 2 +- cluster/aws/util.sh | 8 +++---- cluster/gce/config-default.sh | 4 ++-- cluster/gce/config-test.sh | 4 ++-- docs/getting-started-guides/rkt/README.md | 4 ++-- hack/jenkins/e2e.sh | 28 +++++++++++------------ 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 7013eec1873..5435239d554 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -56,7 +56,7 @@ INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-kubernetes}" CLUSTER_ID=${INSTANCE_PREFIX} AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa} IAM_PROFILE_MASTER="kubernetes-master" -IAM_PROFILE_MINION="kubernetes-minion" +IAM_PROFILE_NODE="kubernetes-minion" LOG="/dev/null" @@ -130,7 +130,7 @@ ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAcco # Optional: Enable/disable public IP assignment for minions. # Important Note: disable only if you have setup a NAT instance for internet access and configured appropriate routes! -ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_MINION_PUBLIC_IP:-true} +ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true} # OS options for minions KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}" diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 0a38279de5c..45aa58816eb 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -54,7 +54,7 @@ INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-e2e-test-${USER}}" CLUSTER_ID=${INSTANCE_PREFIX} AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa} IAM_PROFILE_MASTER="kubernetes-master" -IAM_PROFILE_MINION="kubernetes-minion" +IAM_PROFILE_NODE="kubernetes-minion" LOG="/dev/null" @@ -126,7 +126,7 @@ ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAcco # Optional: Enable/disable public IP assignment for minions. # Important Note: disable only if you have setup a NAT instance for internet access and configured appropriate routes! -ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_MINION_PUBLIC_IP:-true} +ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true} # OS options for minions KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}" diff --git a/cluster/aws/options.md b/cluster/aws/options.md index 9db6e60af01..952b05a92d6 100644 --- a/cluster/aws/options.md +++ b/cluster/aws/options.md @@ -46,7 +46,7 @@ Please note: `kube-up` utilizes ephemeral storage available on instances for doc support ephemeral storage and will default to docker storage on the root disk which is usually only 8GB. EBS-only instance types include `t2`, `c4`, and `m4`. -**KUBE_ENABLE_MINION_PUBLIC_IP** +**KUBE_ENABLE_NODE_PUBLIC_IP** Should a public IP automatically assigned to the minions? "true" or "false" Defaults to: "true" diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 0c3f3a3ca85..8154897278c 100755 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -609,9 +609,9 @@ function ensure-iam-profiles { echo "Creating master IAM profile: ${IAM_PROFILE_MASTER}" create-iam-profile ${IAM_PROFILE_MASTER} } - aws iam get-instance-profile --instance-profile-name ${IAM_PROFILE_MINION} || { - echo "Creating minion IAM profile: ${IAM_PROFILE_MINION}" - create-iam-profile ${IAM_PROFILE_MINION} + aws iam get-instance-profile --instance-profile-name ${IAM_PROFILE_NODE} || { + echo "Creating minion IAM profile: ${IAM_PROFILE_NODE}" + create-iam-profile ${IAM_PROFILE_NODE} } } @@ -998,7 +998,7 @@ function start-minions() { ${AWS_ASG_CMD} create-launch-configuration \ --launch-configuration-name ${ASG_NAME} \ --image-id $KUBE_MINION_IMAGE \ - --iam-instance-profile ${IAM_PROFILE_MINION} \ + --iam-instance-profile ${IAM_PROFILE_NODE} \ --instance-type $MINION_SIZE \ --key-name ${AWS_SSH_KEY_NAME} \ --security-groups ${MINION_SG_ID} \ diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 8fd2fa8422f..c641ccec5f1 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -31,8 +31,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_MINION_IMAGE:-"${MASTER_IMAGE}"} -MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} +MINION_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} +MINION_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 8eca5118d70..ca2e015af86 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -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_MINION_IMAGE:-"${MASTER_IMAGE}"} -MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} +MINION_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} +MINION_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/docs/getting-started-guides/rkt/README.md b/docs/getting-started-guides/rkt/README.md index cae3b48d6fa..c9c2208bd29 100644 --- a/docs/getting-started-guides/rkt/README.md +++ b/docs/getting-started-guides/rkt/README.md @@ -72,8 +72,8 @@ To use rkt as the container runtime for your CoreOS cluster on GCE, you need to ```console $ export KUBE_OS_DISTRIBUTION=coreos -$ export KUBE_GCE_MINION_IMAGE= -$ export KUBE_GCE_MINION_PROJECT=coreos-cloud +$ export KUBE_GCE_NODE_IMAGE= +$ export KUBE_GCE_NODE_PROJECT=coreos-cloud $ export KUBE_CONTAINER_RUNTIME=rkt ``` diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 33a9519788f..e1559d0e926 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -553,8 +553,8 @@ case ${JOB_NAME} in )"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"} : ${PROJECT:="kubekins-e2e-gce-trusty-rls"} - : ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} - : ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} + : ${KUBE_GCE_NODE_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} + : ${KUBE_GCE_NODE_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} : ${KUBE_OS_DISTRIBUTION:="trusty"} : ${ENABLE_CLUSTER_REGISTRY:=false} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"} @@ -571,8 +571,8 @@ case ${JOB_NAME} in )"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-trusty-slow"} : ${PROJECT:="k8s-e2e-gce-trusty-slow"} - : ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} - : ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} + : ${KUBE_GCE_NODE_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} + : ${KUBE_GCE_NODE_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} : ${KUBE_OS_DISTRIBUTION:="trusty"} : ${ENABLE_CLUSTER_REGISTRY:=false} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"} @@ -594,8 +594,8 @@ case ${JOB_NAME} in )"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"} : ${PROJECT:="k8s-e2e-gce-trusty-beta"} - : ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} - : ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} + : ${KUBE_GCE_NODE_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} + : ${KUBE_GCE_NODE_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} : ${KUBE_OS_DISTRIBUTION:="trusty"} : ${ENABLE_CLUSTER_REGISTRY:=false} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"} @@ -613,8 +613,8 @@ case ${JOB_NAME} in )"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-trusty-beta-slow"} : ${PROJECT:="k8s-e2e-gce-trusty-beta-slow"} - : ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} - : ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} + : ${KUBE_GCE_NODE_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} + : ${KUBE_GCE_NODE_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} : ${KUBE_OS_DISTRIBUTION:="trusty"} : ${ENABLE_CLUSTER_REGISTRY:=false} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"} @@ -1419,7 +1419,7 @@ case ${JOB_NAME} in MASTER_SIZE="n1-standard-2" MINION_SIZE="n1-standard-1" KUBEMARK_MASTER_SIZE="n1-standard-4" - KUBEMARK_NUM_MINIONS="100" + KUBEMARK_NUM_NODES="100" ;; # Run Kubemark test on a fake 500 node cluster to test for regressions on @@ -1439,7 +1439,7 @@ case ${JOB_NAME} in KUBE_GCE_INSTANCE_PREFIX="kubemark500" E2E_ZONE="asia-east1-a" KUBEMARK_MASTER_SIZE="n1-standard-16" - KUBEMARK_NUM_MINIONS="500" + KUBEMARK_NUM_NODES="500" ;; # Run big Kubemark test, this currently means a 1000 node cluster and 16 core master @@ -1461,7 +1461,7 @@ case ${JOB_NAME} in KUBE_GCE_INSTANCE_PREFIX="kubemark1000" E2E_ZONE="asia-east1-a" KUBEMARK_MASTER_SIZE="n1-standard-16" - KUBEMARK_NUM_MINIONS="1000" + KUBEMARK_NUM_NODES="1000" ;; esac @@ -1475,8 +1475,8 @@ export KUBE_GCE_ZONE=${E2E_ZONE} export KUBE_GCE_NETWORK=${E2E_NETWORK} export KUBE_GCE_INSTANCE_PREFIX=${KUBE_GCE_INSTANCE_PREFIX:-} export KUBE_GCS_STAGING_PATH_SUFFIX=${KUBE_GCS_STAGING_PATH_SUFFIX:-} -export KUBE_GCE_MINION_PROJECT=${KUBE_GCE_MINION_PROJECT:-} -export KUBE_GCE_MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-} +export KUBE_GCE_NODE_PROJECT=${KUBE_GCE_NODE_PROJECT:-} +export KUBE_GCE_NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-} export KUBE_OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-} # GKE variables @@ -1718,7 +1718,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then NUM_MINIONS_BKP=${NUM_MINIONS} MASTER_SIZE_BKP=${MASTER_SIZE} ./test/kubemark/stop-kubemark.sh - NUM_MINIONS=${KUBEMARK_NUM_MINIONS:-$NUM_MINIONS} + NUM_MINIONS=${KUBEMARK_NUM_NODES:-$NUM_MINIONS} MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE} ./test/kubemark/start-kubemark.sh ./test/kubemark/run-e2e-tests.sh --ginkgo.focus="should\sallow\sstarting\s30\spods\sper\snode" --delete-namespace="false" --gather-resource-usage="false"