Merge pull request #52116 from ixdy/gcloud-regexp-flag-fix

Automatic merge from submit-queue Convert deprecated gcloud --regexp flag into --filter **What this PR does / why we need it**: #49673 missed a flag in hiding: ```console WARNING: Flag --regexp is deprecated. Use --filter="name~'REGEXP'" instead. ERROR: gcloud crashed (TypeError): 'NoneType' object is not iterable If you would like to report this issue, please run the following command: gcloud feedback To check gcloud for common problems, please run the following command: gcloud info --run-diagnostics ``` (Also it's great how gcloud crashes, rather than handling the deprecation gracefully.) **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49673 **Release note**: ```release-note NONE ``` cc @pci

Merge pull request #52116 from ixdy/gcloud-regexp-flag-fix
8ed63636 · Kubernetes Submit Queue · GitHub · f4f21b3f · b310b328 · 8ed63636
Commit 8ed63636 authored Sep 07, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 07, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

util.sh cluster/gce/util.sh +2 -1

No files found.
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1833,7 +1833,8 @@ function set-replica-name() {
 #
 # $1: project
 function get-template() {
-  gcloud compute instance-templates list -r "${NODE_INSTANCE_PREFIX}-template(-(${KUBE_RELEASE_VERSION_DASHED_REGEX}|${KUBE_CI_VERSION_DASHED_REGEX}))?" \
+  gcloud compute instance-templates list \
+    --filter="name ~ '${NODE_INSTANCE_PREFIX}-template(-(${KUBE_RELEASE_VERSION_DASHED_REGEX}|${KUBE_CI_VERSION_DASHED_REGEX}))?'" \
    --project="${1}" --format='value(name)'
 }