github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minion->Node rename: IAM_PROFILE_NODE, KUBE_ENABLE_NODE_PUBLIC_IP, etc

Browse Source 
KUBE_GCE_NODE_IMAGE, KUBE_GCE_NODE_PROJECT, KUBEMARK_NUM_NODES
This commit is contained in:
Brad Erickson 2015-11-23 18:59:56 -08:00
parent a7425bf070
commit 6b91b45eff
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/aws/config-default.sh
View File

@ -56,7 +56,7 @@ INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-kubernetes}"
CLUSTER_ID=${INSTANCE_PREFIX} CLUSTER_ID=${INSTANCE_PREFIX}
AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa} AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa}
IAM_PROFILE_MASTER="kubernetes-master" IAM_PROFILE_MASTER="kubernetes-master"
IAM_PROFILE_MINION="kubernetes-minion" IAM_PROFILE_NODE="kubernetes-minion"
LOG="/dev/null" LOG="/dev/null"
@ -130,7 +130,7 @@ ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAcco
# Optional: Enable/disable public IP assignment for minions. # 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! # 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 # OS options for minions
KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}" KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}"

4
cluster/aws/config-test.sh
View File

@ -54,7 +54,7 @@ INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-e2e-test-${USER}}"
CLUSTER_ID=${INSTANCE_PREFIX} CLUSTER_ID=${INSTANCE_PREFIX}
AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa} AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa}
IAM_PROFILE_MASTER="kubernetes-master" IAM_PROFILE_MASTER="kubernetes-master"
IAM_PROFILE_MINION="kubernetes-minion" IAM_PROFILE_NODE="kubernetes-minion"
LOG="/dev/null" LOG="/dev/null"
@ -126,7 +126,7 @@ ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAcco
# Optional: Enable/disable public IP assignment for minions. # 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! # 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 # OS options for minions
KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}" KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}"

2
cluster/aws/options.md
View File

@ -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. 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`. 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" Should a public IP automatically assigned to the minions? "true" or "false"
Defaults to: "true" Defaults to: "true"

8
cluster/aws/util.sh
View File

@ -609,9 +609,9 @@ function ensure-iam-profiles {
echo "Creating master IAM profile: ${IAM_PROFILE_MASTER}" echo "Creating master IAM profile: ${IAM_PROFILE_MASTER}"
create-iam-profile ${IAM_PROFILE_MASTER} create-iam-profile ${IAM_PROFILE_MASTER}
} }
aws iam get-instance-profile --instance-profile-name ${IAM_PROFILE_MINION} || { aws iam get-instance-profile --instance-profile-name ${IAM_PROFILE_NODE} || {
echo "Creating minion IAM profile: ${IAM_PROFILE_MINION}" echo "Creating minion IAM profile: ${IAM_PROFILE_NODE}"
create-iam-profile ${IAM_PROFILE_MINION} create-iam-profile ${IAM_PROFILE_NODE}
} }
} }
@ -998,7 +998,7 @@ function start-minions() {
${AWS_ASG_CMD} create-launch-configuration \ ${AWS_ASG_CMD} create-launch-configuration \
--launch-configuration-name ${ASG_NAME} \ --launch-configuration-name ${ASG_NAME} \
--image-id $KUBE_MINION_IMAGE \ --image-id $KUBE_MINION_IMAGE \
--iam-instance-profile ${IAM_PROFILE_MINION} \ --iam-instance-profile ${IAM_PROFILE_NODE} \
--instance-type $MINION_SIZE \ --instance-type $MINION_SIZE \
--key-name ${AWS_SSH_KEY_NAME} \ --key-name ${AWS_SSH_KEY_NAME} \
--security-groups ${MINION_SG_ID} \ --security-groups ${MINION_SG_ID} \

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

@ -31,8 +31,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_MINION_IMAGE:-"${MASTER_IMAGE}"} MINION_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} MINION_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}

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

@ -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_MINION_IMAGE:-"${MASTER_IMAGE}"} MINION_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} MINION_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}

4
docs/getting-started-guides/rkt/README.md
View File

@ -72,8 +72,8 @@ To use rkt as the container runtime for your CoreOS cluster on GCE, you need to
```console ```console
$ export KUBE_OS_DISTRIBUTION=coreos $ export KUBE_OS_DISTRIBUTION=coreos
$ export KUBE_GCE_MINION_IMAGE=<image_id> $ export KUBE_GCE_NODE_IMAGE=<image_id>
$ export KUBE_GCE_MINION_PROJECT=coreos-cloud $ export KUBE_GCE_NODE_PROJECT=coreos-cloud
$ export KUBE_CONTAINER_RUNTIME=rkt $ export KUBE_CONTAINER_RUNTIME=rkt
``` ```

28
hack/jenkins/e2e.sh
View File

@ -553,8 +553,8 @@ case ${JOB_NAME} in
)"} )"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"}
: ${PROJECT:="kubekins-e2e-gce-trusty-rls"} : ${PROJECT:="kubekins-e2e-gce-trusty-rls"}
: ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} : ${KUBE_GCE_NODE_PROJECT:="${TRUSTY_IMAGE_PROJECT}"}
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} : ${KUBE_GCE_NODE_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"} : ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false} : ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"}
@ -571,8 +571,8 @@ case ${JOB_NAME} in
)"} )"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-trusty-slow"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-trusty-slow"}
: ${PROJECT:="k8s-e2e-gce-trusty-slow"} : ${PROJECT:="k8s-e2e-gce-trusty-slow"}
: ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} : ${KUBE_GCE_NODE_PROJECT:="${TRUSTY_IMAGE_PROJECT}"}
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} : ${KUBE_GCE_NODE_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"} : ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false} : ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"}
@ -594,8 +594,8 @@ case ${JOB_NAME} in
)"} )"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"}
: ${PROJECT:="k8s-e2e-gce-trusty-beta"} : ${PROJECT:="k8s-e2e-gce-trusty-beta"}
: ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} : ${KUBE_GCE_NODE_PROJECT:="${TRUSTY_IMAGE_PROJECT}"}
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} : ${KUBE_GCE_NODE_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"} : ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false} : ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"}
@ -613,8 +613,8 @@ case ${JOB_NAME} in
)"} )"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-trusty-beta-slow"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-trusty-beta-slow"}
: ${PROJECT:="k8s-e2e-gce-trusty-beta-slow"} : ${PROJECT:="k8s-e2e-gce-trusty-beta-slow"}
: ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"} : ${KUBE_GCE_NODE_PROJECT:="${TRUSTY_IMAGE_PROJECT}"}
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} : ${KUBE_GCE_NODE_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"} : ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false} : ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"}
@ -1419,7 +1419,7 @@ case ${JOB_NAME} in
MASTER_SIZE="n1-standard-2" MASTER_SIZE="n1-standard-2"
MINION_SIZE="n1-standard-1" MINION_SIZE="n1-standard-1"
KUBEMARK_MASTER_SIZE="n1-standard-4" 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 # 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" KUBE_GCE_INSTANCE_PREFIX="kubemark500"
E2E_ZONE="asia-east1-a" E2E_ZONE="asia-east1-a"
KUBEMARK_MASTER_SIZE="n1-standard-16" 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 # 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" KUBE_GCE_INSTANCE_PREFIX="kubemark1000"
E2E_ZONE="asia-east1-a" E2E_ZONE="asia-east1-a"
KUBEMARK_MASTER_SIZE="n1-standard-16" KUBEMARK_MASTER_SIZE="n1-standard-16"
KUBEMARK_NUM_MINIONS="1000" KUBEMARK_NUM_NODES="1000"
;; ;;
esac esac
@ -1475,8 +1475,8 @@ export KUBE_GCE_ZONE=${E2E_ZONE}
export KUBE_GCE_NETWORK=${E2E_NETWORK} export KUBE_GCE_NETWORK=${E2E_NETWORK}
export KUBE_GCE_INSTANCE_PREFIX=${KUBE_GCE_INSTANCE_PREFIX:-} export KUBE_GCE_INSTANCE_PREFIX=${KUBE_GCE_INSTANCE_PREFIX:-}
export KUBE_GCS_STAGING_PATH_SUFFIX=${KUBE_GCS_STAGING_PATH_SUFFIX:-} export KUBE_GCS_STAGING_PATH_SUFFIX=${KUBE_GCS_STAGING_PATH_SUFFIX:-}
export KUBE_GCE_MINION_PROJECT=${KUBE_GCE_MINION_PROJECT:-} export KUBE_GCE_NODE_PROJECT=${KUBE_GCE_NODE_PROJECT:-}
export KUBE_GCE_MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-} export KUBE_GCE_NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-}
export KUBE_OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-} export KUBE_OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-}
# GKE variables # GKE variables
@ -1718,7 +1718,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
NUM_MINIONS_BKP=${NUM_MINIONS} NUM_MINIONS_BKP=${NUM_MINIONS}
MASTER_SIZE_BKP=${MASTER_SIZE} MASTER_SIZE_BKP=${MASTER_SIZE}
./test/kubemark/stop-kubemark.sh ./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} MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE}
./test/kubemark/start-kubemark.sh ./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" ./test/kubemark/run-e2e-tests.sh --ginkgo.focus="should\sallow\sstarting\s30\spods\sper\snode" --delete-namespace="false" --gather-resource-usage="false"