Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add gameserver values as configurable in helm terraform modules #1693

Merged
merged 19 commits into from
Jul 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4f77bd2
add gameserver values as configurable in helm TF modules
Jul 15, 2020
61abf22
Update install/terraform/modules/helm/helm.tf
comerford Jul 15, 2020
b25e22f
Update install/terraform/modules/helm/helm.tf
comerford Jul 15, 2020
acd6817
Update install/terraform/modules/helm3/helm.tf
comerford Jul 15, 2020
35d0640
Update install/terraform/modules/helm3/helm.tf
comerford Jul 15, 2020
c0450d6
Update install/terraform/modules/helm3/helm.tf
comerford Jul 15, 2020
516a11f
Update install/terraform/modules/helm/helm.tf
comerford Jul 15, 2020
40ff18d
Update install/terraform/modules/helm3/helm.tf
comerford Jul 15, 2020
026be86
Update install/terraform/modules/helm/helm.tf
comerford Jul 15, 2020
93f032a
using camel case in variable names for consistency
Jul 15, 2020
b5a3043
adding documentation of the variables into GKE/AKS/EKS docs
Jul 16, 2020
ba9bc3f
Merge branch 'master' into install_terraform_module_add_helm_settings
Jul 16, 2020
e706942
Merge branch 'master' into install_terraform_module_add_helm_settings
Jul 17, 2020
794f388
Merge branch 'master' into install_terraform_module_add_helm_settings
Jul 17, 2020
94d1d3e
Remove extraneous blank line
comerford Jul 30, 2020
a414a90
Gating gameserver settings for 1.8.0 release
comerford Jul 30, 2020
c82a8bd
Gating gameserver features for 1.8.0 release
comerford Jul 30, 2020
8268872
Gating gameserver features for 1.8.0 release
comerford Jul 30, 2020
6ee438d
Merge branch 'master' into install_terraform_module_add_helm_settings
comerford Jul 30, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions install/terraform/modules/helm/helm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,21 @@ resource "helm_release" "agones" {
value = var.feature_gates
}

set {
name = "gameservers.namespaces"
value = var.gameserver_namespaces
}

set {
name = "gameservers.minPort"
value = var.gameserver_minPort
}

set {
name = "gameservers.maxPort"
value = var.gameserver_maxPort
}

version = var.agones_version
namespace = "agones-system"

Expand Down
12 changes: 12 additions & 0 deletions install/terraform/modules/helm/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,15 @@ variable "ping_service_type" {
variable "values_file" {
default = ""
}

variable "gameserver_minPort" {
default = "7000"
}

variable "gameserver_maxPort" {
default = "8000"
}

variable "gameserver_namespaces" {
default = ["default"]
}
comerford marked this conversation as resolved.
Show resolved Hide resolved
18 changes: 17 additions & 1 deletion install/terraform/modules/helm3/helm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,20 @@ resource "helm_release" "agones" {
name = "agones.featureGates"
value = var.feature_gates
}
}

set {
comerford marked this conversation as resolved.
Show resolved Hide resolved
name = "gameservers.namespaces"
value = var.gameserver_namespaces
}

set {
name = "gameservers.minPort"
value = var.gameserver_minPort
}

set {
name = "gameservers.maxPort"
value = var.gameserver_maxPort
}

}
12 changes: 12 additions & 0 deletions install/terraform/modules/helm3/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,15 @@ variable "ping_service_type" {
variable "values_file" {
default = ""
}

variable "gameserver_minPort" {
default = "7000"
}

variable "gameserver_maxPort" {
default = "8000"
}

variable "gameserver_namespaces" {
default = ["default"]
}
7 changes: 6 additions & 1 deletion site/content/en/docs/Installation/Terraform/aks.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ Configurable parameters:
- region - the location of the cluster
- node_count - count of game server nodes for the default node pool (default is "4")
- feature_gates - a list of alpha and beta version features to enable. For example, "PlayerTracking=true&ContainerPortAllocation=true"
{{% feature publishVersion="1.8.0" %}}
- gameserver_minPort - the lower bound of the port range which gameservers will listen on (default is "7000")
roberthbailey marked this conversation as resolved.
Show resolved Hide resolved
- gameserver_maxPort - the upper bound of the port range which gameservers will listen on (default is "8000")
- gameserver_namespaces - a list of namespaces which will be used to run gameservers (default is `["default"]`). For example `["default", "xbox-gameservers", "mobile-gameservers"]`
{{% /feature %}}

## Uninstall the Agones and delete AKS cluster

Expand All @@ -63,4 +68,4 @@ Details on how you can authenticate your AKS terraform provider using official [

## Next Steps

- [Confirm Agones is up and running]({{< relref "../confirm.md" >}})
- [Confirm Agones is up and running]({{< relref "../confirm.md" >}})
7 changes: 6 additions & 1 deletion site/content/en/docs/Installation/Terraform/eks.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,15 @@ Configurable parameters:
- cluster_name - the name of the EKS cluster (default is "agones-terraform-example")
- agones_version - the version of agones to install (an empty string, which is the 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")
- region - the location of the cluster (default is "us-west2")
- region - the location of the cluster (default is "us-west-2")
- 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")
- feature_gates - a list of alpha and beta version features to enable. For example, "PlayerTracking=true&ContainerPortAllocation=true"
{{% feature publishVersion="1.8.0" %}}
- gameserver_minPort - the lower bound of the port range which gameservers will listen on (default is "7000")
- gameserver_maxPort - the upper bound of the port range which gameservers will listen on (default is "8000")
- gameserver_namespaces - a list of namespaces which will be used to run gameservers (default is `["default"]`). For example `["default", "xbox-gameservers", "mobile-gameservers"]`
{{% /feature %}}

Now you can create an EKS cluster and deploy Agones on EKS:
```
Expand Down
7 changes: 6 additions & 1 deletion site/content/en/docs/Installation/Terraform/gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ Configurable parameters:
- network - the name of the VPC network you want your cluster and firewall rules to be connected to (default is "default")
- log_level - possible values: Fatal, Error, Warn, Info, Debug (default is "info")
- feature_gates - a list of alpha and beta version features to enable. For example, "PlayerTracking=true&ContainerPortAllocation=true"
{{% feature publishVersion="1.8.0" %}}
- gameserver_minPort - the lower bound of the port range which gameservers will listen on (default is "7000")
- gameserver_maxPort - the upper bound of the port range which gameservers will listen on (default is "8000")
- gameserver_namespaces - a list of namespaces which will be used to run gameservers (default is `["default"]`). For example `["default", "xbox-gameservers", "mobile-gameservers"]`
{{% /feature %}}

{{% alert title="Warning" color="warning"%}}
On the lines that read `source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/gke/?ref=master"`
Expand Down Expand Up @@ -142,4 +147,4 @@ terraform destroy -var project="<YOUR_GCP_ProjectID>"

## Next Steps

- [Confirm Agones is up and running]({{< relref "../confirm.md" >}})
- [Confirm Agones is up and running]({{< relref "../confirm.md" >}})