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

Merge pull request #3280 from zmerlynn/gke_network

Browse Source 
Allow specifying GCE network in GKE provider, default to "e2e" for tests
This commit is contained in:
Tim Hockin 2015-01-07 12:49:01 -08:00
commit 6b0118321e
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.

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

@ -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.

3
cluster/gke/util.sh
View File

@ -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"