terraform make rules merge into google-cloud.mk (#3958)

Co-authored-by: Mengye (Max) Gong <[email protected]>

build/Makefile

@@ -246,7 +246,6 @@ include ./includes/$(osinclude)
 include ./includes/build-image.mk
 include ./includes/release.mk
 include ./includes/google-cloud.mk
-include ./includes/terraform.mk
 include ./includes/minikube.mk
 include ./includes/kind.mk
 include ./includes/website.mk

build/includes/google-cloud.mk

@@ -50,12 +50,21 @@ gcloud-test-cluster: $(ensure-build-image)
 clean-gcloud-test-cluster: $(ensure-build-image)
 	$(MAKE) gcloud-terraform-destroy-cluster
 
-gcloud-e2e-infra-state-bucket: GCP_PROJECT ?= $(shell $(current_project))
-gcloud-e2e-infra-state-bucket:
-	$(MAKE) terraform-init DIRECTORY=e2e/state-bucket
-	docker run --rm -it $(common_mounts) $(build_tag) bash -c 'cd $(mount_path)/build/terraform/e2e/state-bucket && \
-      	terraform apply -auto-approve -var project="$(GCP_PROJECT)"'
+# Pulls down authentication information for kubectl against a cluster, name can be specified through GCP_CLUSTER_NAME
+# (defaults to 'test-cluster')
+gcloud-auth-cluster: $(ensure-build-image)
+	docker run --rm $(common_mounts) $(build_tag) gcloud container clusters get-credentials $(GCP_CLUSTER_NAME) --zone  $(GCP_CLUSTER_LOCATION)
+
+# authenticate our docker configuration so that you can do a docker push directly
+# to the Google Artifact Registry repository
+gcloud-auth-docker: $(ensure-build-image)
+	docker run --rm $(common_mounts) $(build_tag) gcloud auth print-access-token | docker login -u oauth2accesstoken --password-stdin https://us-docker.pkg.dev
+
+# Clean the gcloud configuration
+clean-gcloud-config:
+	-sudo rm -r $(build_path)/.config
 
+# Ensure the end-to-end infrastructure state bucket
 ensure-e2e-infra-state-bucket: GCP_PROJECT ?= $(shell $(current_project))
 ensure-e2e-infra-state-bucket:
 	@buckets=$$(docker run --rm $(common_mounts) $(build_tag) gcloud storage buckets describe gs://$(GCP_PROJECT)-e2e-infra-bucket-tfstate --format="value(name)");\
@@ -64,6 +73,13 @@ ensure-e2e-infra-state-bucket:
 		$(MAKE) gcloud-e2e-infra-state-bucket;\
 	fi
 
+# Creates the end-to-end infrastructure bucket
+gcloud-e2e-infra-state-bucket: GCP_PROJECT ?= $(shell $(current_project))
+gcloud-e2e-infra-state-bucket:
+	$(MAKE) terraform-init DIRECTORY=e2e/state-bucket
+	docker run --rm -it $(common_mounts) $(build_tag) bash -c 'cd $(mount_path)/build/terraform/e2e/state-bucket && \
+      	terraform apply -auto-approve -var project="$(GCP_PROJECT)"'
+
 # Creates a gcloud cluster for end-to-end
 gcloud-e2e-test-cluster: GCP_PROJECT ?= $(shell $(current_project))
 gcloud-e2e-test-cluster: $(ensure-build-image) ensure-e2e-infra-state-bucket
@@ -79,16 +95,104 @@ clean-gcloud-e2e-test-cluster:
 	$(MAKE) terraform-init BUCKET=$(GCP_PROJECT)-e2e-infra-bucket-tfstate PREFIX=terraform/state DIRECTORY=e2e
 	$(DOCKER_RUN) bash -c 'cd $(mount_path)/build/terraform/e2e && terraform destroy -var project=$(GCP_PROJECT) -auto-approve'
 
-# Pulls down authentication information for kubectl against a cluster, name can be specified through GCP_CLUSTER_NAME
-# (defaults to 'test-cluster')
-gcloud-auth-cluster: $(ensure-build-image)
-	docker run --rm $(common_mounts) $(build_tag) gcloud container clusters get-credentials $(GCP_CLUSTER_NAME) --zone  $(GCP_CLUSTER_LOCATION)
+# The GKE development cluster name
+GCP_TF_CLUSTER_NAME ?= agones-tf-cluster
 
-# authenticate our docker configuration so that you can do a docker push directly
-# to the Google Artifact Registry repository
-gcloud-auth-docker: $(ensure-build-image)
-	docker run --rm $(common_mounts) $(build_tag) gcloud auth print-access-token | docker login -u oauth2accesstoken --password-stdin https://us-docker.pkg.dev
+# The current project
+current_project := $(DOCKER_RUN) bash -c "gcloud config get-value project 2> /dev/null"
 
-# Clean the gcloud configuration
-clean-gcloud-config:
-	-sudo rm -r $(build_path)/.config
+### Deploy cluster with Terraform
+terraform-init: TERRAFORM_BUILD_DIR ?= $(mount_path)/build/terraform/$(DIRECTORY)
+terraform-init: $(ensure-build-image)
+terraform-init:
+	docker run --rm -it $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) bash -c '\
+	cd $(TERRAFORM_BUILD_DIR) && terraform init -backend-config="bucket=$(BUCKET)" -backend-config="prefix=$(PREFIX)" && gcloud auth application-default login'
+
+terraform-clean: TERRAFORM_BUILD_DIR ?= $(mount_path)/build/terraform/gke
+terraform-clean:
+	$(DOCKER_RUN) bash -c ' \
+	cd $(TERRAFORM_BUILD_DIR) && rm -r ./.terraform || true && \
+	rm ./terraform.tfstate* || true && \
+	rm ./kubeconfig || true'
+
+# Creates a cluster and install release version of Agones controller
+# Version could be specified by AGONES_VERSION
+# Alpha Feature gates are disabled
+gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_INITIALNODECOUNT ?= 4
+gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_MACHINETYPE ?= e2-standard-4
+gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_ENABLEIMAGESTREAMING ?= true
+gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_AUTOSCALE ?= false
+gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_MIN_NODECOUNT ?= 1
+gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_MAX_NODECOUNT ?= 5
+gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_WINDOWSINITIALNODECOUNT ?= 0
+gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_WINDOWSMACHINETYPE ?= e2-standard-4
+gcloud-terraform-cluster: AGONES_VERSION ?= ''
+gcloud-terraform-cluster: GCP_TF_CLUSTER_NAME ?= agones-tf-cluster
+gcloud-terraform-cluster: LOG_LEVEL ?= debug
+gcloud-terraform-cluster: $(ensure-build-image)
+gcloud-terraform-cluster: FEATURE_GATES := ""
+gcloud-terraform-cluster: GCP_PROJECT ?= $(shell $(current_project))
+gcloud-terraform-cluster:
+	$(MAKE) terraform-init DIRECTORY=gke
+	$(DOCKER_RUN) bash -c 'cd $(mount_path)/build/terraform/gke && \
+		 terraform apply -auto-approve -var agones_version="$(AGONES_VERSION)" \
+		-var name=$(GCP_TF_CLUSTER_NAME) -var machine_type="$(GCP_CLUSTER_NODEPOOL_MACHINETYPE)" \
+		-var values_file="" \
+		-var feature_gates=$(FEATURE_GATES) \
+		-var project="$(GCP_PROJECT)" \
+		-var location="$(GCP_CLUSTER_LOCATION)" \
+		-var log_level="$(LOG_LEVEL)" \
+		-var autoscale=$(GCP_CLUSTER_NODEPOOL_AUTOSCALE) \
+		-var min_node_count=$(GCP_CLUSTER_NODEPOOL_MIN_NODECOUNT) \
+		-var max_node_count=$(GCP_CLUSTER_NODEPOOL_MAX_NODECOUNT) \
+		-var node_count=$(GCP_CLUSTER_NODEPOOL_INITIALNODECOUNT) \
+		-var enable_image_streaming=$(GCP_CLUSTER_NODEPOOL_ENABLEIMAGESTREAMING) \
+		-var windows_node_count=$(GCP_CLUSTER_NODEPOOL_WINDOWSINITIALNODECOUNT) \
+		-var windows_machine_type=$(GCP_CLUSTER_NODEPOOL_WINDOWSMACHINETYPE)'
+	GCP_CLUSTER_NAME=$(GCP_TF_CLUSTER_NAME) $(MAKE) gcloud-auth-cluster
+
+# Creates a cluster and install current version of Agones controller
+# Set all necessary variables as `make install` does
+# Unifies previous `make gcloud-test-cluster` and `make install` targets
+gcloud-terraform-install: GCP_CLUSTER_NODEPOOL_INITIALNODECOUNT ?= 4
+gcloud-terraform-install: GCP_CLUSTER_NODEPOOL_MACHINETYPE ?= e2-standard-4
+gcloud-terraform-install: GCP_CLUSTER_NODEPOOL_AUTOSCALE ?= false
+gcloud-terraform-install: GCP_CLUSTER_NODEPOOL_MIN_NODECOUNT ?= 1
+gcloud-terraform-install: GCP_CLUSTER_NODEPOOL_MAX_NODECOUNT ?= 5
+gcloud-terraform-install: GCP_CLUSTER_NODEPOOL_WINDOWSINITIALNODECOUNT ?= 0
+gcloud-terraform-install: GCP_CLUSTER_NODEPOOL_WINDOWSMACHINETYPE ?= e2-standard-4
+gcloud-terraform-install: ALWAYS_PULL_SIDECAR := true
+gcloud-terraform-install: IMAGE_PULL_POLICY := "Always"
+gcloud-terraform-install: PING_SERVICE_TYPE := "LoadBalancer"
+gcloud-terraform-install: CRD_CLEANUP := true
+gcloud-terraform-install: GCP_TF_CLUSTER_NAME ?= agones-tf-cluster
+gcloud-terraform-install: LOG_LEVEL ?= debug
+gcloud-terraform-install: FEATURE_GATES := $(ALPHA_FEATURE_GATES)
+gcloud-terraform-install: GCP_PROJECT ?= $(shell $(current_project))
+gcloud-terraform-install:
+	$(MAKE) terraform-init DIRECTORY=gke
+	$(DOCKER_RUN) bash -c ' \
+	cd $(mount_path)/build/terraform/gke && 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)" \
+		-var ping_service_type="$(PING_SERVICE_TYPE)" \
+		-var crd_cleanup="$(CRD_CLEANUP)" \
+		-var chart="../../../install/helm/agones/" \
+		-var name=$(GCP_TF_CLUSTER_NAME) -var machine_type="$(GCP_CLUSTER_NODEPOOL_MACHINETYPE)" \
+		-var project=$(GCP_PROJECT) \
+		-var location=$(GCP_CLUSTER_LOCATION) \
+		-var log_level=$(LOG_LEVEL) \
+		-var autoscale=$(GCP_CLUSTER_NODEPOOL_AUTOSCALE) \
+		-var min_node_count=$(GCP_CLUSTER_NODEPOOL_MIN_NODECOUNT) \
+		-var max_node_count=$(GCP_CLUSTER_NODEPOOL_MAX_NODECOUNT) \
+		-var feature_gates=$(FEATURE_GATES) \
+		-var node_count=$(GCP_CLUSTER_NODEPOOL_INITIALNODECOUNT) \
+		-var windows_node_count=$(GCP_CLUSTER_NODEPOOL_WINDOWSINITIALNODECOUNT) \
+		-var windows_machine_type=$(GCP_CLUSTER_NODEPOOL_WINDOWSMACHINETYPE)'
+	GCP_CLUSTER_NAME=$(GCP_TF_CLUSTER_NAME) $(MAKE) gcloud-auth-cluster
+
+gcloud-terraform-destroy-cluster: GCP_PROJECT ?= $(shell $(current_project))
+gcloud-terraform-destroy-cluster:
+	$(MAKE) terraform-init DIRECTORY=gke
+	$(DOCKER_RUN) bash -c 'cd $(mount_path)/build/terraform/gke && terraform destroy -var project=$(GCP_PROJECT) -auto-approve'