Update domain registry proxy terraform annealing config

1) Change annealing target to watch for sandbox terraform config instead of test.
2) Delete terraform config for test project, as this project will be turned down.
3) Do not ask annealing to watch for alpha project terraform config, as we intend to change alpha regularly and manually.
4) Make terraform output display both service account email and client id.
5) Change canary node ports to 3100X, as 4000X is out of range for kubernetes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=193383457
This commit is contained in:
jianglai 2018-04-18 10:59:43 -07:00
parent eab6fcc8e6
commit 744727a58f
4 changed files with 11 additions and 8 deletions

View file

@ -15,8 +15,8 @@ module "proxy" {
proxy_certificate_bucket = "YOU_CERTIFICATE_BUCKET" proxy_certificate_bucket = "YOU_CERTIFICATE_BUCKET"
} }
output "proxy_service_account_client_id" { output "proxy_service_account" {
value = "${module.proxy.proxy_service_account_client_id}" value = "${module.proxy.proxy_service_account}"
} }
output "proxy_name_servers" { output "proxy_name_servers" {

View file

@ -39,8 +39,8 @@ variable "proxy_ports_canary" {
type = "map" type = "map"
default = { default = {
health_check = 40000 health_check = 31000
whois = 40001 whois = 31001
epp = 40002 epp = 31002
} }
} }

View file

@ -6,8 +6,11 @@ output "proxy_instance_groups" {
value = "${local.proxy_instance_groups}" value = "${local.proxy_instance_groups}"
} }
output "proxy_service_account_client_id" { output "proxy_service_account" {
value = "${google_service_account.proxy_service_account.unique_id}" value = {
email = "${google_service_account.proxy_service_account.email}"
client_id = "${google_service_account.proxy_service_account.unique_id}"
}
} }
output "proxy_ip_addresses" { output "proxy_ip_addresses" {

View file

@ -21,7 +21,7 @@
while read line while read line
do do
gcloud compute instance-groups set-named-ports \ gcloud compute instance-groups set-named-ports \
--named-ports whois:30001,epp:30002,whois-canary:40001,epp-canary:40002 \ --named-ports whois:30001,epp:30002,whois-canary:31001,epp-canary:31002 \
$line $line
done < <(terraform output proxy_instance_groups | awk '{print $3}' | \ done < <(terraform output proxy_instance_groups | awk '{print $3}' | \
awk -F '/' '{print "--project", $7, "--zone", $9, $11}') awk -F '/' '{print "--project", $7, "--zone", $9, $11}')