github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Minior fix on getting subnet mode by gcloud

Browse Source
This commit is contained in:
Jing Ai 2017-10-11 14:32:25 -07:00
parent e57accbd03
commit a56241e13e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/util.sh
View File

@ -779,7 +779,7 @@ function create-network() {
gcloud compute networks create --project "${NETWORK_PROJECT}" "${NETWORK}" --mode=auto gcloud compute networks create --project "${NETWORK_PROJECT}" "${NETWORK}" --mode=auto
else else
PREEXISTING_NETWORK=true PREEXISTING_NETWORK=true
PREEXISTING_NETWORK_MODE="$(gcloud compute networks list ${NETWORK} --project ${NETWORK_PROJECT} --format='value(x_gcloud_mode)' || true)" PREEXISTING_NETWORK_MODE="$(gcloud compute networks list --filter="name=('${NETWORK}')" --project ${NETWORK_PROJECT} --format='value(x_gcloud_subnet_mode)' || true)"
echo "Found existing network ${NETWORK} in ${PREEXISTING_NETWORK_MODE} mode." echo "Found existing network ${NETWORK} in ${PREEXISTING_NETWORK_MODE} mode."
fi fi
@ -937,7 +937,7 @@ function delete-subnetworks() {
if [[ ${ENABLE_IP_ALIASES:-} != "true" ]]; then if [[ ${ENABLE_IP_ALIASES:-} != "true" ]]; then
if [[ "${ENABLE_BIG_CLUSTER_SUBNETS}" = "true" ]]; then if [[ "${ENABLE_BIG_CLUSTER_SUBNETS}" = "true" ]]; then
# If running in custom mode network we need to delete subnets # If running in custom mode network we need to delete subnets
mode="$(gcloud compute networks list ${NETWORK} --project ${NETWORK_PROJECT} --format='value(x_gcloud_mode)' || true)" mode="$(gcloud compute networks list --filter="name=('${NETWORK}')" --project ${NETWORK_PROJECT} --format='value(x_gcloud_subnet_mode)' || true)"
if [[ "${mode}" == "custom" ]]; then if [[ "${mode}" == "custom" ]]; then
echo "Deleting default subnets..." echo "Deleting default subnets..."
# This value should be kept in sync with number of regions. # This value should be kept in sync with number of regions.