Added log_level parameter to Terraform deployment (#1438)

minor fix
googleforgames · Mar 30, 2020 · 154e7fe · 154e7fe
1 parent 6ff2787
commit 154e7fe
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 0 deletions.
diff --git a/build/includes/terraform.mk b/build/includes/terraform.mk
@@ -31,6 +31,7 @@ gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_INITIALNODECOUNT ?= 4
 gcloud-terraform-cluster: GCP_CLUSTER_NODEPOOL_MACHINETYPE ?= n1-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:
 ifndef GCP_PROJECT
@@ -41,6 +42,7 @@ endif
 		-var name=$(GCP_TF_CLUSTER_NAME) -var machine_type="$(GCP_CLUSTER_NODEPOOL_MACHINETYPE)" \
 		-var values_file="" \
 		-var zone="$(GCP_CLUSTER_ZONE)" -var project="$(GCP_PROJECT)" \
+		-var log_level="$(LOG_LEVEL)" \
 		-var node_count=$(GCP_CLUSTER_NODEPOOL_INITIALNODECOUNT)'
 	GCP_CLUSTER_NAME=$(GCP_TF_CLUSTER_NAME) $(MAKE) gcloud-auth-cluster
 
@@ -54,6 +56,7 @@ 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:
 ifndef GCP_PROJECT
 	$(eval GCP_PROJECT=$(shell sh -c "gcloud config get-value project 2> /dev/null"))
@@ -68,6 +71,7 @@ endif
 		-var chart="../../../install/helm/agones/" \
 		-var name=$(GCP_TF_CLUSTER_NAME) -var machine_type="$(GCP_CLUSTER_NODEPOOL_MACHINETYPE)" \
 		-var zone=$(GCP_CLUSTER_ZONE) -var project=$(GCP_PROJECT) \
+		-var log_level=$(LOG_LEVEL) \
 		-var node_count=$(GCP_CLUSTER_NODEPOOL_INITIALNODECOUNT)'
 	GCP_CLUSTER_NAME=$(GCP_TF_CLUSTER_NAME) $(MAKE) gcloud-auth-cluster
 

diff --git a/build/terraform/gke/module.tf b/build/terraform/gke/module.tf
@@ -88,6 +88,10 @@ variable "image_pull_secret" {
   default = ""
 }
 
+variable "log_level" {
+  default = "info"
+}
+
 
 module "gke_cluster" {
   source = "../../../install/terraform/modules/gke"
@@ -115,6 +119,7 @@ module "helm_agones" {
   image_pull_secret      = var.image_pull_secret
   crd_cleanup            = var.crd_cleanup
   ping_service_type      = var.ping_service_type
+  log_level              = var.log_level
 }
 
 output "host" {

diff --git a/examples/terraform-submodules/aks/module.tf b/examples/terraform-submodules/aks/module.tf
@@ -43,6 +43,10 @@ variable "client_secret" {
 
 variable "machine_type" { default = "Standard_D2_v2" }
 
+variable "log_level" {
+  default = "info"
+}
+
 module "aks_cluster" {
   source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/aks/?ref=master"
 
@@ -63,6 +67,7 @@ module "helm_agones" {
   host                   = module.aks_cluster.host
   token                  = module.aks_cluster.token
   cluster_ca_certificate = module.aks_cluster.cluster_ca_certificate
+  log_level              = var.log_level
 }
 
 output "host" {

diff --git a/examples/terraform-submodules/eks/module.tf b/examples/terraform-submodules/eks/module.tf
@@ -40,6 +40,10 @@ provider "aws" {
 
 variable "machine_type" { default = "t2.large" }
 
+variable "log_level" {
+  default = "info"
+}
+
 module "eks_cluster" {
   source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/eks/?ref=master"
 
@@ -65,6 +69,7 @@ module "helm_agones" {
   host                   = module.eks_cluster.host
   token                  = data.aws_eks_cluster_auth.example.token
   cluster_ca_certificate = module.eks_cluster.cluster_ca_certificate
+  log_level              = var.log_level
 }
 
 output "host" {

diff --git a/examples/terraform-submodules/gke/module.tf b/examples/terraform-submodules/gke/module.tf
@@ -57,6 +57,10 @@ variable "network" {
   description = "The name of the VPC network to attach the cluster and firewall rule to"
 }
 
+variable "log_level" {
+  default = "info"
+}
+
 module "gke_cluster" {
   // ***************************************************************************************************
   // Update ?ref= to the agones release you are installing. For example, ?ref=release-1.3.0 corresponds
@@ -87,6 +91,7 @@ module "helm_agones" {
   host                   = module.gke_cluster.host
   token                  = module.gke_cluster.token
   cluster_ca_certificate = module.gke_cluster.cluster_ca_certificate
+  log_level              = var.log_level
 }
 
 output "host" {

diff --git a/install/terraform/modules/helm/helm.tf b/install/terraform/modules/helm/helm.tf
@@ -139,6 +139,11 @@ resource "helm_release" "agones" {
     value = var.ping_service_type
   }
 
+  set {
+    name  = "agones.controller.logLevel"
+    value = var.log_level
+  }
+
   version   = var.agones_version
   namespace = "agones-system"
 

diff --git a/install/terraform/modules/helm/variables.tf b/install/terraform/modules/helm/variables.tf
@@ -26,6 +26,10 @@ variable "udp_expose" {
   default = "true"
 }
 
+variable "log_level" {
+  default = "info"
+}
+
 variable "host" {}
 
 variable "token" {}

diff --git a/site/content/en/docs/Installation/Terraform/aks.md b/site/content/en/docs/Installation/Terraform/aks.md
@@ -40,6 +40,9 @@ Check that you have access to the Kubernetes cluster:
 kubectl get nodes
 ```
 
+Configurable parameters:
+- log_level - possible values: Fatal, Error, Warn, Info, Debug (default is "info")
+
 ## Uninstall the Agones and delete AKS cluster
 
 Run next command to delete all Terraform provisioned resources:

diff --git a/site/content/en/docs/Installation/Terraform/eks.md b/site/content/en/docs/Installation/Terraform/eks.md
@@ -36,6 +36,7 @@ Configurable parameters:
 - agones_version - the version of agones to install (default is the latest version from the [Helm repository](https://agones.dev/chart/stable))
 - machine_type - EC2 instance type for hosting game servers (default is "t2.large")
 - node_count - count of game server nodes for the default node pool (default is "4")
+- log_level - possible values: Fatal, Error, Warn, Info, Debug (default is "info")
 
 Now you can create an EKS cluster and deploy Agones on EKS:
 ```

diff --git a/site/content/en/docs/Installation/Terraform/gke.md b/site/content/en/docs/Installation/Terraform/gke.md
@@ -90,6 +90,7 @@ Configurable parameters:
 - zone - the name of the [zone](https://cloud.google.com/compute/docs/regions-zones) you want your cluster to be
   created in. (default is "us-west1-c")
 - network - the name of the VPC network you want your cluster and firewall rules be connected to (default is "default")
+- log_level - possible values: Fatal, Error, Warn, Info, Debug (default is "info")
 
 {{% alert title="Warning" color="warning"%}}
 On the lines that read `source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/gke/?ref=master"`