github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-26 12:02:34 +00:00
Code Issues Projects Releases Wiki Activity

Introduce MASTER_IMAGE, MINION_IMAGE and OS_DISTRIBUTION to config-default

Browse Source 
for enable coreos and rocket support
This commit is contained in:
Dawn Chen 2015-04-28 00:25:43 -07:00
parent 44e7109341
commit 8963347b9e
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,11 +23,14 @@ MINION_SIZE=${MINION_SIZE:-n1-standard-1}
NUM_MINIONS=${NUM_MINIONS:-4} NUM_MINIONS=${NUM_MINIONS:-4}
MINION_DISK_TYPE=pd-standard MINION_DISK_TYPE=pd-standard
MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB}
# TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud will expand this OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
# to the latest supported image. MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150317}
IMAGE=container-vm-v20150317 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
IMAGE_PROJECT=google-containers MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150317}
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
NETWORK=${KUBE_GCE_NETWORK:-default} NETWORK=${KUBE_GCE_NETWORK:-default}
INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-kubernetes}" INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-kubernetes}"
MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_NAME="${INSTANCE_PREFIX}-master"

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

@ -23,11 +23,14 @@ MINION_SIZE=${MINION_SIZE:-g1-small}
NUM_MINIONS=${NUM_MINIONS:-2} NUM_MINIONS=${NUM_MINIONS:-2}
MINION_DISK_TYPE=pd-standard MINION_DISK_TYPE=pd-standard
MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB}
# TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud will expand this OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
# to the latest supported image. MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150317}
IMAGE=container-vm-v20150317 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
IMAGE_PROJECT=google-containers MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150317}
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
NETWORK=${KUBE_GCE_NETWORK:-e2e} NETWORK=${KUBE_GCE_NETWORK:-e2e}
INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-e2e-test-${USER}}" INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-e2e-test-${USER}}"
MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_NAME="${INSTANCE_PREFIX}-master"

8
cluster/gce/util.sh
View File

@ -367,8 +367,8 @@ function create-node-template {
--machine-type "${MINION_SIZE}" \ --machine-type "${MINION_SIZE}" \
--boot-disk-type "${MINION_DISK_TYPE}" \ --boot-disk-type "${MINION_DISK_TYPE}" \
--boot-disk-size "${MINION_DISK_SIZE}" \ --boot-disk-size "${MINION_DISK_SIZE}" \
--image-project="${IMAGE_PROJECT}" \ --image-project="${MINION_IMAGE_PROJECT}" \
--image "${IMAGE}" \ --image "${MINION_IMAGE}" \
--tags "${MINION_TAG}" \ --tags "${MINION_TAG}" \
--network "${NETWORK}" \ --network "${NETWORK}" \
$2 \ $2 \
@ -522,8 +522,8 @@ function create-master-instance {
--project "${PROJECT}" \ --project "${PROJECT}" \
--zone "${ZONE}" \ --zone "${ZONE}" \
--machine-type "${MASTER_SIZE}" \ --machine-type "${MASTER_SIZE}" \
--image-project="${IMAGE_PROJECT}" \ --image-project="${MASTER_IMAGE_PROJECT}" \
--image "${IMAGE}" \ --image "${MASTER_IMAGE}" \
--tags "${MASTER_TAG}" \ --tags "${MASTER_TAG}" \
--network "${NETWORK}" \ --network "${NETWORK}" \
--scopes "storage-ro" "compute-rw" \ --scopes "storage-ro" "compute-rw" \