From 468808723af249a9eb4dad6632da4f1fc7737abb Mon Sep 17 00:00:00 2001 From: jianglai Date: Wed, 20 Feb 2019 11:42:47 -0800 Subject: [PATCH] Move domain registry terraform configs We are moving toward using GitHub as the source of truth for the domain registry project (Nomulus). As such, the piper location will soon be deleted, along with it the terraform configs. These files are copied to the canonical location [] Note that the files under modules will still be present in the open source code base as it allows open source users to set up the project quickly. The files under envs are specific to each actual project and is removed entirely from the open source code (it was excluded by MOE before). Some files are renamed to conform to the newly established terraform code style. There was a remaining regarding using latchkey to set up IAM policies that I intend to punt for now. I imagine if we decide to use latchkey, it means that the IAM related terraform configs will be removed for the Annealing set up. However we would still like to leave that in the open source configs such that it still is a one-stop shop to set up your project. The automation mode is set to DRYRUN so that there are no accidental changes to our projects during .dev launch. It will be changed back later. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=234838043 --- java/google/registry/proxy/terraform/modules/gke/cluster.tf | 4 ++-- .../proxy/terraform/modules/gke/{input.tf => variables.tf} | 0 .../terraform/modules/networking/{input.tf => variables.tf} | 0 .../proxy/terraform/modules/{input.tf => variables.tf} | 0 java/google/registry/proxy/terraform/update_named_ports.sh | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename java/google/registry/proxy/terraform/modules/gke/{input.tf => variables.tf} (100%) rename java/google/registry/proxy/terraform/modules/networking/{input.tf => variables.tf} (100%) rename java/google/registry/proxy/terraform/modules/{input.tf => variables.tf} (100%) diff --git a/java/google/registry/proxy/terraform/modules/gke/cluster.tf b/java/google/registry/proxy/terraform/modules/gke/cluster.tf index fa91ba6db..19f53ef86 100644 --- a/java/google/registry/proxy/terraform/modules/gke/cluster.tf +++ b/java/google/registry/proxy/terraform/modules/gke/cluster.tf @@ -33,8 +33,8 @@ resource "google_container_cluster" "proxy_cluster" { } management { - auto_repair = true - auto_upgrade = true + auto_repair = "true" + auto_upgrade = "true" } } } diff --git a/java/google/registry/proxy/terraform/modules/gke/input.tf b/java/google/registry/proxy/terraform/modules/gke/variables.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/gke/input.tf rename to java/google/registry/proxy/terraform/modules/gke/variables.tf diff --git a/java/google/registry/proxy/terraform/modules/networking/input.tf b/java/google/registry/proxy/terraform/modules/networking/variables.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/networking/input.tf rename to java/google/registry/proxy/terraform/modules/networking/variables.tf diff --git a/java/google/registry/proxy/terraform/modules/input.tf b/java/google/registry/proxy/terraform/modules/variables.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/input.tf rename to java/google/registry/proxy/terraform/modules/variables.tf diff --git a/java/google/registry/proxy/terraform/update_named_ports.sh b/java/google/registry/proxy/terraform/update_named_ports.sh index 238417e37..f24e869cb 100755 --- a/java/google/registry/proxy/terraform/update_named_ports.sh +++ b/java/google/registry/proxy/terraform/update_named_ports.sh @@ -25,6 +25,6 @@ CANARY_PORTS="whois-canary:31001,epp-canary:31002,"\ while read line do gcloud compute instance-groups set-named-ports --named-ports \ - ${PROD_PORTS},${CANARY_PORTS} $line + "${PROD_PORTS}","${CANARY_PORTS}" "$line" done < <(terraform output proxy_instance_groups | awk '{print $3}' | \ awk -F '/' '{print "--project", $7, "--zone", $9, $11}')