Skip to content

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

Merge pull request #61065 from freehan/fix-gcloud-dev

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix validation for dev gcloud ```release-note NONE ```
parents 52ed0368 ec77fe97
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
cluster/gce/util.sh
View file @ e81965d4
...@@ -1292,6 +1292,9 @@ minVersion = version.LooseVersion("1.3.0") ...@@ -1292,6 +1292,9 @@ minVersion = version.LooseVersion("1.3.0")
required = [ "alpha", "beta", "core" ] required = [ "alpha", "beta", "core" ]
data = json.loads(sys.argv[1]) data = json.loads(sys.argv[1])
rel = data.get("Google Cloud SDK") rel = data.get("Google Cloud SDK")
if "CL @" in rel:
print("Using dev version of gcloud: %s" %rel)
exit(0)
if rel != "HEAD" and version.LooseVersion(rel) < minVersion: if rel != "HEAD" and version.LooseVersion(rel) < minVersion:
print("gcloud version out of date ( < %s )" % minVersion) print("gcloud version out of date ( < %s )" % minVersion)
exit(1) exit(1)
......
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