Skip to content

K
k3s
Commit 5038fc0f authored by Joe Beda's avatar Joe Beda
Browse files
Options

Merge pull request #3056 from zmerlynn/testtar

Allow parameterization by environment in cluster/gce/config-test.sh
parents 9550b6b8 94545889
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
cluster/gce/config-default.sh
View file @ 5038fc0f
...@@ -17,17 +17,17 @@ ...@@ -17,17 +17,17 @@
# TODO(jbeda): Provide a way to override project # TODO(jbeda): Provide a way to override project
# gcloud multiplexing for shared GCE/GKE tests. # gcloud multiplexing for shared GCE/GKE tests.
GCLOUD=gcloud GCLOUD=gcloud
ZONE=us-central1-b ZONE=${KUBE_GCE_ZONE:-us-central1-b}
MASTER_SIZE=n1-standard-1 MASTER_SIZE=n1-standard-1
MINION_SIZE=n1-standard-1 MINION_SIZE=n1-standard-1
NUM_MINIONS=4 NUM_MINIONS=${NUM_MINIONS:-4}
# TODO(dchen1107): Filed an internal issue to create an alias # TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud will expand this # for containervm image, so that gcloud will expand this
# to the latest supported image. # to the latest supported image.
IMAGE=container-vm-v20141208 IMAGE=container-vm-v20141208
IMAGE_PROJECT=google-containers IMAGE_PROJECT=google-containers
NETWORK=default NETWORK=${KUBE_GCE_NETWORK:-default}
INSTANCE_PREFIX=kubernetes INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-kubernetes}"
MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_NAME="${INSTANCE_PREFIX}-master"
MASTER_TAG="${INSTANCE_PREFIX}-master" MASTER_TAG="${INSTANCE_PREFIX}-master"
MINION_TAG="${INSTANCE_PREFIX}-minion" MINION_TAG="${INSTANCE_PREFIX}-minion"
......
cluster/gce/config-test.sh
View file @ 5038fc0f
...@@ -17,17 +17,17 @@ ...@@ -17,17 +17,17 @@
# TODO(jbeda): Provide a way to override project # TODO(jbeda): Provide a way to override project
# gcloud multiplexing for shared GCE/GKE tests. # gcloud multiplexing for shared GCE/GKE tests.
GCLOUD=gcloud GCLOUD=gcloud
ZONE=us-central1-b ZONE=${KUBE_GCE_ZONE:-us-central1-b}
MASTER_SIZE=g1-small MASTER_SIZE=g1-small
MINION_SIZE=g1-small MINION_SIZE=g1-small
NUM_MINIONS=2 NUM_MINIONS=${NUM_MINIONS:-2}
# TODO(dchen1107): Filed an internal issue to create an alias # TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud will expand this # for containervm image, so that gcloud will expand this
# to the latest supported image. # to the latest supported image.
IMAGE=container-vm-v20141208 IMAGE=container-vm-v20141208
IMAGE_PROJECT=google-containers IMAGE_PROJECT=google-containers
NETWORK=e2e NETWORK=${KUBE_GCE_NETWORK:-e2e}
INSTANCE_PREFIX="e2e-test-${USER}" INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-e2e-test-${USER}}"
MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_NAME="${INSTANCE_PREFIX}-master"
MASTER_TAG="${INSTANCE_PREFIX}-master" MASTER_TAG="${INSTANCE_PREFIX}-master"
MINION_TAG="${INSTANCE_PREFIX}-minion" MINION_TAG="${INSTANCE_PREFIX}-minion"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment