github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12985 from mbabker/gke-machine-type

Browse Source 
Add ability to specify machine type for GKE
This commit is contained in:
Jerzy Szczepkowski 2015-08-21 10:29:01 +02:00
commit 3a6158f8ad
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/gke/config-common.sh
View File

@ -28,6 +28,7 @@ GCLOUD="${GCLOUD:-gcloud}"
CMD_GROUP="${CMD_GROUP:-beta}" CMD_GROUP="${CMD_GROUP:-beta}"
GCLOUD_CONFIG_DIR="${GCLOUD_CONFIG_DIR:-${HOME}/.config/gcloud/kubernetes}" GCLOUD_CONFIG_DIR="${GCLOUD_CONFIG_DIR:-${HOME}/.config/gcloud/kubernetes}"
MINION_SCOPES="${MINION_SCOPES:-"compute-rw,storage-ro"}" MINION_SCOPES="${MINION_SCOPES:-"compute-rw,storage-ro"}"
MACHINE_TYPE="${MACHINE_TYPE:-n1-standard-1}"
# WARNING: any new vars added here must correspond to options that can be # WARNING: any new vars added here must correspond to options that can be
# passed to `gcloud {CMD_GROUP} container clusters create`, or they will # passed to `gcloud {CMD_GROUP} container clusters create`, or they will

2
cluster/gke/util.sh
View File

@ -113,6 +113,7 @@ function verify-prereqs() {
# CLUSTER_API_VERSION (optional) # CLUSTER_API_VERSION (optional)
# NUM_MINIONS # NUM_MINIONS
# MINION_SCOPES # MINION_SCOPES
# MACHINE_TYPE
function kube-up() { function kube-up() {
echo "... in gke:kube-up()" >&2 echo "... in gke:kube-up()" >&2
detect-project >&2 detect-project >&2
@ -145,6 +146,7 @@ function kube-up() {
"--network=${NETWORK}" "--network=${NETWORK}"
"--scopes=${MINION_SCOPES}" "--scopes=${MINION_SCOPES}"
"--cluster-version=${CLUSTER_API_VERSION}" "--cluster-version=${CLUSTER_API_VERSION}"
"--machine-type=${MACHINE_TYPE}"
) )
# Bring up the cluster. # Bring up the cluster.