Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
5512c214
Commit
5512c214
authored
Jun 08, 2018
by
Dylan Griffith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure --zone is passed to all gcloud commands for auto devops cluster specs
parent
2c05c857
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
3 deletions
+14
-3
qa/qa/service/kubernetes_cluster.rb
qa/qa/service/kubernetes_cluster.rb
+14
-3
No files found.
qa/qa/service/kubernetes_cluster.rb
View file @
5512c214
...
@@ -20,9 +20,11 @@ module QA
...
@@ -20,9 +20,11 @@ module QA
gcloud container clusters
gcloud container clusters
create
#{
cluster_name
}
create
#{
cluster_name
}
--enable-legacy-authorization
--enable-legacy-authorization
--zone
us-central1-a
--zone
#{
gcloud_zone
}
&& gcloud container clusters
&& gcloud container clusters
get-credentials
#{
cluster_name
}
get-credentials
--zone
#{
gcloud_zone
}
#{
cluster_name
}
CMD
CMD
@api_url
=
`kubectl config view --minify -o jsonpath='{.clusters[].cluster.server}'`
@api_url
=
`kubectl config view --minify -o jsonpath='{.clusters[].cluster.server}'`
...
@@ -32,7 +34,12 @@ module QA
...
@@ -32,7 +34,12 @@ module QA
end
end
def
remove!
def
remove!
shell
(
"gcloud container clusters delete
#{
cluster_name
}
--quiet --async"
)
shell
<<~
CMD
.
tr
(
"
\n
"
,
' '
)
gcloud container clusters delete
--zone
#{
gcloud_zone
}
#{
cluster_name
}
--quiet --async
CMD
end
end
private
private
...
@@ -61,6 +68,10 @@ module QA
...
@@ -61,6 +68,10 @@ module QA
ensure
ensure
gcloud_account_key
&&
gcloud_account_key
.
unlink
gcloud_account_key
&&
gcloud_account_key
.
unlink
end
end
def
gcloud_zone
ENV
.
fetch
(
'GCLOUD_ZONE'
)
end
end
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment