Merge pull request #12538 from cjcullen/network

Always use the --cluster-version flag for the gke provider.
This commit is contained in:
CJ Cullen 2015-08-11 11:00:52 -07:00
commit 389b9657b2

View File

@ -144,12 +144,8 @@ function kube-up() {
"--num-nodes=${NUM_MINIONS}" "--num-nodes=${NUM_MINIONS}"
"--network=${NETWORK}" "--network=${NETWORK}"
"--scopes=${MINION_SCOPES}" "--scopes=${MINION_SCOPES}"
"--cluster-version=${CLUSTER_API_VERSION}"
) )
if [[ ! -z "${DOGFOOD_GCLOUD:-}" ]]; then
create_args+=("--cluster-version=${CLUSTER_API_VERSION:-}")
else
create_args+=("--cluster-api-version=${CLUSTER_API_VERSION:-}")
fi
# Bring up the cluster. # Bring up the cluster.
"${GCLOUD}" "${CMD_GROUP}" container clusters create "${CLUSTER_NAME}" "${create_args[@]}" "${GCLOUD}" "${CMD_GROUP}" container clusters create "${CLUSTER_NAME}" "${create_args[@]}"