mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
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.
This commit is contained in:
commit
914e56c09f
@ -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
|
# List network resources. We include names starting with "a", corresponding to
|
||||||
# those that Kubernetes creates.
|
# 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.
|
# 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.
|
# This assumes that the network name is the second field in the output.
|
||||||
GREP_REGEX="^NAME\|^[^ ]\+[ ]\+\(default\|${NETWORK}\) "
|
GREP_REGEX="^NAME\|^[^ ]\+[ ]\+\(default\|${NETWORK}\) "
|
||||||
gcloud-compute-list routes --regexp="default.*|${INSTANCE_PREFIX}.*"
|
gcloud-compute-list routes --regexp="default.*|${INSTANCE_PREFIX}.*"
|
||||||
gcloud-compute-list firewall-rules --regexp="default.*|k8s-fw.*|${INSTANCE_PREFIX}.*"
|
gcloud-compute-list firewall-rules --regexp="default.*|k8s-fw.*|${INSTANCE_PREFIX}.*"
|
||||||
GREP_REGEX=""
|
GREP_REGEX=""
|
||||||
gcloud-compute-list forwarding-rules ${REGION:+"--region=${REGION}"}
|
gcloud-compute-list forwarding-rules ${REGION:+"--regions=${REGION}"}
|
||||||
gcloud-compute-list target-pools ${REGION:+"--region=${REGION}"}
|
gcloud-compute-list target-pools ${REGION:+"--regions=${REGION}"}
|
||||||
|
Loading…
Reference in New Issue
Block a user