Commit af7c9804 authored by Dan Davison's avatar Dan Davison 🌴

Allow specificity for GKE Cluster Location

Use GCLOUD_REGION over GCLOUD_ZONE.
Using REGION over ZONE provides more of a
guarantee of cluster size, and dist-
ributes between a region's zones
parent b77d94aa
......@@ -173,8 +173,8 @@ module QA
ENV.fetch("GCLOUD_ACCOUNT_EMAIL")
end
def gcloud_zone
ENV.fetch('GCLOUD_ZONE')
def gcloud_region
ENV.fetch('GCLOUD_REGION')
end
def has_gcloud_credentials?
......
......@@ -28,17 +28,17 @@ module QA
create #{cluster_name}
#{auth_options}
--enable-basic-auth
--zone #{Runtime::Env.gcloud_zone}
--region #{Runtime::Env.gcloud_region}
&& gcloud container clusters
get-credentials
--zone #{Runtime::Env.gcloud_zone}
--region #{Runtime::Env.gcloud_region}
#{cluster_name}
CMD
@api_url = `kubectl config view --minify -o jsonpath='{.clusters[].cluster.server}'`
@admin_user = "#{cluster_name}-admin"
master_auth = JSON.parse(`gcloud container clusters describe #{cluster_name} --zone #{Runtime::Env.gcloud_zone} --format 'json(masterAuth.username, masterAuth.password)'`)
master_auth = JSON.parse(`gcloud container clusters describe #{cluster_name} --region #{Runtime::Env.gcloud_region} --format 'json(masterAuth.username, masterAuth.password)'`)
shell <<~CMD.tr("\n", ' ')
kubectl config set-credentials #{@admin_user}
--username #{master_auth['masterAuth']['username']}
......@@ -66,10 +66,10 @@ module QA
def remove!
shell <<~CMD.tr("\n", ' ')
gcloud container clusters delete
--zone #{Runtime::Env.gcloud_zone}
#{cluster_name}
--quiet --async
CMD
--region #{Runtime::Env.gcloud_region}
#{cluster_name}
--quiet --async
CMD
end
private
......
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