Skip to content

K
k3s
Commit 914e56c0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30479 from ixdy/gcloud-list-resources

Automatic merge from submit-queue Use --regions instead of --region for gcloud list [resource] gcloud has started complaining: ``` WARNING: Abbreviated flag [--region] will be disabled in release 132.0.0, use the full name [--regions]. WARNING: Abbreviated flag [--region] will be disabled in release 132.0.0, use the full name [--regions]. WARNING: Abbreviated flag [--region] will be disabled in release 132.0.0, use the full name [--regions]. ``` We'll probably need to cherry-pick this, as otherwise the list-resources script will start failing at some point in the future.
parents 7dd71c7b 4a32dc19
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cluster/gce/list-resources.sh
View file @ 914e56c0
......@@ -82,12 +82,12 @@ gcloud-compute-list disks ${ZONE:+"--zones=${ZONE}"} --regexp="${INSTANCE_PREFIX
# List network resources. We include names starting with "a", corresponding to
# those that Kubernetes creates.
gcloud-compute-list addresses ${REGION:+"--region=${REGION}"} --regexp="a.*|${INSTANCE_PREFIX}.*"
gcloud-compute-list addresses ${REGION:+"--regions=${REGION}"} --regexp="a.*|${INSTANCE_PREFIX}.*"
# Match either the header or a line with the specified e2e network.
# This assumes that the network name is the second field in the output.
GREP_REGEX="^NAME\|^[^ ]\+[ ]\+\(default\|${NETWORK}\) "
gcloud-compute-list routes --regexp="default.*|${INSTANCE_PREFIX}.*"
gcloud-compute-list firewall-rules --regexp="default.*|k8s-fw.*|${INSTANCE_PREFIX}.*"
GREP_REGEX=""
gcloud-compute-list forwarding-rules ${REGION:+"--region=${REGION}"}
gcloud-compute-list target-pools ${REGION:+"--region=${REGION}"}
gcloud-compute-list forwarding-rules ${REGION:+"--regions=${REGION}"}
gcloud-compute-list target-pools ${REGION:+"--regions=${REGION}"}
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