From 49f1030c4deda4bbe678c2a390c20e1bc18da3f5 Mon Sep 17 00:00:00 2001
From: Amit Levy <amitlevy347@gmail.com>
Date: Fri, 1 Nov 2019 16:37:03 +0200
Subject: [PATCH] Move terraform modules from ./build to ./install

---
 build/includes/terraform.mk                            | 8 ++++----
 examples/terraform-submodules/aks/module.tf            | 4 ++--
 examples/terraform-submodules/gke-local/main.tf        | 4 ++--
 {build => install/terraform}/modules/aks/aks.tf        | 0
 {build => install/terraform}/modules/aks/outputs.tf    | 0
 {build => install/terraform}/modules/aks/variables.tf  | 0
 {build => install/terraform}/modules/gke/cluster.tf    | 0
 {build => install/terraform}/modules/gke/outputs.tf    | 0
 {build => install/terraform}/modules/gke/variables.tf  | 0
 {build => install/terraform}/modules/helm/helm.tf      | 0
 {build => install/terraform}/modules/helm/variables.tf | 0
 11 files changed, 8 insertions(+), 8 deletions(-)
 rename {build => install/terraform}/modules/aks/aks.tf (100%)
 rename {build => install/terraform}/modules/aks/outputs.tf (100%)
 rename {build => install/terraform}/modules/aks/variables.tf (100%)
 rename {build => install/terraform}/modules/gke/cluster.tf (100%)
 rename {build => install/terraform}/modules/gke/outputs.tf (100%)
 rename {build => install/terraform}/modules/gke/variables.tf (100%)
 rename {build => install/terraform}/modules/helm/helm.tf (100%)
 rename {build => install/terraform}/modules/helm/variables.tf (100%)

diff --git a/build/includes/terraform.mk b/build/includes/terraform.mk
index f27b316cb3..e2a83514f0 100644
--- a/build/includes/terraform.mk
+++ b/build/includes/terraform.mk
@@ -15,7 +15,7 @@
 ### Deploy cluster with Terraform
 terraform-init:
 	docker run --rm -it $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) bash -c '\
-	cd $(mount_path)/build && terraform init && gcloud auth application-default login'
+	cd $(mount_path)/install/terraform && terraform init && gcloud auth application-default login'
 
 terraform-clean:
 	rm -r ./.terraform
@@ -32,7 +32,7 @@ ifndef GCP_PROJECT
 	$(eval GCP_PROJECT=$(shell sh -c "gcloud config get-value project 2> /dev/null"))
 endif
 	$(DOCKER_RUN) bash -c 'export TF_VAR_agones_version=$(AGONES_VERSION) && \
-		cd $(mount_path)/build && terraform apply -auto-approve -var values_file="" \
+		cd $(mount_path)/install/terraform && terraform apply -auto-approve -var values_file="" \
 		-var chart="agones" \
 	 	-var "cluster={name=\"$(GCP_CLUSTER_NAME)\", machineType=\"$(GCP_CLUSTER_NODEPOOL_MACHINETYPE)\", \
 		 zone=\"$(GCP_CLUSTER_ZONE)\", project=\"$(GCP_PROJECT)\", \
@@ -52,7 +52,7 @@ ifndef GCP_PROJECT
 	$(eval GCP_PROJECT=$(shell sh -c "gcloud config get-value project 2> /dev/null"))
 endif
 	$(DOCKER_RUN) bash -c ' \
-		cd $(mount_path)/build && terraform apply -auto-approve -var agones_version="$(VERSION)" -var image_registry="$(REGISTRY)" \
+		cd $(mount_path)/install/terraform && terraform apply -auto-approve -var agones_version="$(VERSION)" -var image_registry="$(REGISTRY)" \
 		-var pull_policy="$(IMAGE_PULL_POLICY)" \
 		-var always_pull_sidecar="$(ALWAYS_PULL_SIDECAR)" \
 		-var image_pull_secret="$(IMAGE_PULL_SECRET)" \
@@ -64,5 +64,5 @@ endif
 	$(MAKE) gcloud-auth-cluster
 
 gcloud-terraform-destroy-cluster:
-	$(DOCKER_RUN) bash -c 'cd $(mount_path)/build && \
+	$(DOCKER_RUN) bash -c 'cd $(mount_path)/install/terraform && \
 	 terraform destroy -auto-approve'
diff --git a/examples/terraform-submodules/aks/module.tf b/examples/terraform-submodules/aks/module.tf
index 7ad23a44e3..75cd52fc0c 100644
--- a/examples/terraform-submodules/aks/module.tf
+++ b/examples/terraform-submodules/aks/module.tf
@@ -27,14 +27,14 @@ variable "cluster_name" {
 variable "machine_type" {default = "Standard_D2_v2"}
 
 module "aks_cluster" {
-  source = "git::https://github.com/googleforgames/agones.git//build/modules/aks/?ref=master"
+  source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/aks/?ref=master"
   
   machine_type = "${var.machine_type}"
   cluster_name = "${var.cluster_name}"
 }
 
 module "helm_agones" {
-  source = "git::https://github.com/googleforgames/agones.git//build/modules/helm/?ref=master"
+  source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/helm/?ref=master"
   
   agones_version = "${var.agones_version}"
   values_file=""
diff --git a/examples/terraform-submodules/gke-local/main.tf b/examples/terraform-submodules/gke-local/main.tf
index 2716fc882f..1e7041228a 100644
--- a/examples/terraform-submodules/gke-local/main.tf
+++ b/examples/terraform-submodules/gke-local/main.tf
@@ -27,7 +27,7 @@ variable "project" {
 }
 module "gke_cluster" {
 
-  source = "../../../build/modules/gke"
+  source = "../../../install/terraform/modules/gke"
 
   cluster = {
     "project"          = "${var.project}"
@@ -40,7 +40,7 @@ module "gke_cluster" {
 
 module "helm_agones" {
 
-  source = "../../../build/modules/helm"
+  source = "../../../install/terraform/modules/helm"
 
   agones_version         = "${var.agones_version}"
   values_file            = ""
diff --git a/build/modules/aks/aks.tf b/install/terraform/modules/aks/aks.tf
similarity index 100%
rename from build/modules/aks/aks.tf
rename to install/terraform/modules/aks/aks.tf
diff --git a/build/modules/aks/outputs.tf b/install/terraform/modules/aks/outputs.tf
similarity index 100%
rename from build/modules/aks/outputs.tf
rename to install/terraform/modules/aks/outputs.tf
diff --git a/build/modules/aks/variables.tf b/install/terraform/modules/aks/variables.tf
similarity index 100%
rename from build/modules/aks/variables.tf
rename to install/terraform/modules/aks/variables.tf
diff --git a/build/modules/gke/cluster.tf b/install/terraform/modules/gke/cluster.tf
similarity index 100%
rename from build/modules/gke/cluster.tf
rename to install/terraform/modules/gke/cluster.tf
diff --git a/build/modules/gke/outputs.tf b/install/terraform/modules/gke/outputs.tf
similarity index 100%
rename from build/modules/gke/outputs.tf
rename to install/terraform/modules/gke/outputs.tf
diff --git a/build/modules/gke/variables.tf b/install/terraform/modules/gke/variables.tf
similarity index 100%
rename from build/modules/gke/variables.tf
rename to install/terraform/modules/gke/variables.tf
diff --git a/build/modules/helm/helm.tf b/install/terraform/modules/helm/helm.tf
similarity index 100%
rename from build/modules/helm/helm.tf
rename to install/terraform/modules/helm/helm.tf
diff --git a/build/modules/helm/variables.tf b/install/terraform/modules/helm/variables.tf
similarity index 100%
rename from build/modules/helm/variables.tf
rename to install/terraform/modules/helm/variables.tf