Commit 15f0068c authored by Zach Loafman's avatar Zach Loafman

Allow specifying GCE network in GKE provider, default to "e2e" for tests

parent c8244cd1
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
# The following are default-specific settings. # The following are default-specific settings.
CLUSTER_NAME="${CLUSTER_NAME:-${USER}-gke}" CLUSTER_NAME="${CLUSTER_NAME:-${USER}-gke}"
NETWORK=${KUBE_GKE_NETWORK:-default}
# For ease of maintenance, extract any pieces that do not vary between default # For ease of maintenance, extract any pieces that do not vary between default
# and test in a common config. # and test in a common config.
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
# The following are test-specific settings. # The following are test-specific settings.
CLUSTER_NAME="${CLUSTER_NAME:-${USER}-gke-e2e}" CLUSTER_NAME="${CLUSTER_NAME:-${USER}-gke-e2e}"
NETWORK=${KUBE_GKE_NETWORK:-e2e}
# For ease of maintenance, extract any pieces that do not vary between default # For ease of maintenance, extract any pieces that do not vary between default
# and test in a common config. # and test in a common config.
......
...@@ -93,7 +93,8 @@ function kube-up() { ...@@ -93,7 +93,8 @@ function kube-up() {
--zone="${ZONE}" \ --zone="${ZONE}" \
--project="${PROJECT}" \ --project="${PROJECT}" \
--cluster-api-version="${CLUSTER_API_VERSION:-}" \ --cluster-api-version="${CLUSTER_API_VERSION:-}" \
--num-nodes="${NUM_MINIONS}" --num-nodes="${NUM_MINIONS}" \
--network="${NETWORK}"
# Compute DNS_SERVER_IP: This is looking for something like # Compute DNS_SERVER_IP: This is looking for something like
# "servicesIpv4Cidr: 10.27.240.0/20" and returning "10.27.240" # "servicesIpv4Cidr: 10.27.240.0/20" and returning "10.27.240"
......
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