Skip to content

Commit

Permalink
Use terraform-aws-eks module
Browse files Browse the repository at this point in the history
This way of configuring EKS cluster is the most popular, so we will use
this github source for deployment.
There is an issue with UDP ping service deploying on AWS, disabling it
for initial version.
Closes googleforgames#966.
  • Loading branch information
aLekSer committed Aug 26, 2019
1 parent 56149ec commit cd736c6
Show file tree
Hide file tree
Showing 7 changed files with 350 additions and 40 deletions.
169 changes: 143 additions & 26 deletions build/modules/eks/eks.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,46 +19,163 @@ provider "aws" {


resource "aws_vpc" "example" {
cidr_block = "10.0.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = "${
map(
"Name", "terraform-eks",
"kubernetes.io/cluster/example", "shared",
)
}"
cidr_block = "10.0.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = "${
map(
"Name", "terraform-eks",
"kubernetes.io/cluster/example", "shared",
)
}"
}

data "aws_availability_zones" "available" {
}

resource "aws_vpc" "main" {
cidr_block = "10.0.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = "${
map(
"Name", "terraform-eks",
"kubernetes.io/cluster/example", "shared",
)
}"
cidr_block = "10.0.0.0/16"
enable_dns_hostnames = true
enable_dns_support = true
tags = "${
map(
"Name", "terraform-eks",
"kubernetes.io/cluster/example", "shared",
)
}"
}

resource "aws_security_group" "worker_group_mgmt_one" {
name_prefix = "worker_group_mgmt_one"
vpc_id = module.vpc.vpc_id

ingress {
from_port = 22
to_port = 22
protocol = "tcp"

cidr_blocks = [
"10.0.0.0/8",
]
}
ingress {
from_port = 7000
to_port = 8000
protocol = "udp"

cidr_blocks = [
"0.0.0.0/0",
]
}

egress {
from_port = 0
to_port = 0
protocol = "-1"
cidr_blocks = ["0.0.0.0/0"]
}
}

/**/
resource "aws_security_group" "worker_group_mgmt_two" {
name_prefix = "worker_group_mgmt_two"
vpc_id = module.vpc.vpc_id

ingress {
from_port = 22
to_port = 22
protocol = "tcp"

cidr_blocks = [
"192.168.0.0/16",
]
}
}



resource "aws_security_group" "worker_group_mgmt_three" {
name_prefix = "worker_group_mgmt_three"
vpc_id = module.vpc.vpc_id

ingress {
from_port = 22
to_port = 22
protocol = "tcp"

cidr_blocks = [
"192.168.0.0/16",
]
}
}


module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "2.6.0"

name = "test-vpc"
cidr = "10.0.0.0/16"
azs = data.aws_availability_zones.available.names
private_subnets = ["10.0.1.0/24", "10.0.2.0/24"]
public_subnets = ["10.0.4.0/24", "10.0.5.0/24"]
enable_nat_gateway = true
single_nat_gateway = true
enable_dns_hostnames = false

tags = {
"kubernetes.io/cluster/${var.cluster_name}" = "shared"
}

public_subnet_tags = {
"kubernetes.io/cluster/${var.cluster_name}" = "shared"
"kubernetes.io/role/elb" = "1"
}

private_subnet_tags = {
"kubernetes.io/cluster/${var.cluster_name}" = "shared"
"kubernetes.io/role/internal-elb" = "1"
}
}


#
# main EKS terraform resource definition
#
resource "aws_eks_cluster" "main" {
name = "${var.cluster_name}"
module "eks" {
source = "git::github.com/terraform-aws-modules/terraform-aws-eks.git?ref=v5.1.0"
cluster_name = "${var.cluster_name}"
cluster_version = "1.12"

vpc_id = module.vpc.vpc_id
subnets = module.vpc.private_subnets
worker_groups = [
// Node Pool for Gameservers
{
name = "worker-group-1"
instance_type = "t2.micro"
asg_desired_capacity = 5
name = "default"
instance_type = "${var.machine_type}"
asg_desired_capacity = 3
additional_security_group_ids = [aws_security_group.worker_group_mgmt_one.id]
public_ip = true
tags = []
},
// Node Pools with taints for metrics and system
{
name = "worker-group-2"
instance_type = "t2.micro"
name = "agones-system"
instance_type = "${var.machine_type}"
additional_security_group_ids = [aws_security_group.worker_group_mgmt_two.id]
asg_desired_capacity = 5
asg_desired_capacity = 1

kubelet_extra_args = "--node-labels=agones.dev/agones-system=true --register-with-taints=agones.dev/agones-system=true:NO_EXECUTE"
tags = []
},
{
name = "agones-metrics"
instance_type = "${var.machine_type}"
additional_security_group_ids = [aws_security_group.worker_group_mgmt_three.id]
asg_desired_capacity = 1
kubelet_extra_args = "--node-labels=agones.dev/agones-system=true --register-with-taints=agones.dev/agones-metrics=true:NO_EXECUTE"
tags = []
},
]
}
43 changes: 36 additions & 7 deletions build/modules/eks/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,52 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
output "cluster_endpoint" {
description = "Endpoint for EKS control plane."
value = module.eks.cluster_endpoint
}

output "cluster_security_group_id" {
description = "Security group ids attached to the cluster control plane."
value = module.eks.cluster_security_group_id
}

output "kubectl_config" {
description = "kubectl config as generated by the module."
value = module.eks.kubeconfig
}

output "config_map_aws_auth" {
description = "A kubernetes configuration to authenticate to this EKS cluster."
value = module.eks.config_map_aws_auth
}

output "region" {
description = "AWS region."
value = var.region
}



output "cluster_ca_certificate" {
value = "${base64decode(aws_eks_cluster.main.kube_config.0.cluster_ca_certificate)}"
value = "${base64decode( module.eks.cluster_certificate_authority_data)}"
}

output "host" {
depends_on = ["module.eks"]
value = "${ module.eks.cluster_endpoint}"
}
/*
output "client_certificate" {
value = "${aws_eks_cluster.main.kube_config.0.client_certificate}"
value = "${ module.eks.kubeconfig.client_certificate}"
}
output "kube_config" {
value = "${aws_eks_cluster.main.kube_config_raw}"
value = "${ module.eks.kubeconfig}"
}
output "host" {
value = "${aws_eks_cluster.main.kube_config.0.host}"
}
output "token" {
value = "${aws_eks_cluster.main.kube_config.0.password}"
value = "${ module.eks.kubeconfig.password}"
}
*/
45 changes: 45 additions & 0 deletions build/modules/eks/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,48 @@ variable "cluster_name" {
variable "region" {
default = "us-west-2"
}

variable "machine_type" {
default = "t2.large"
}

variable "map_accounts" {
description = "Additional AWS account numbers to add to the aws-auth configmap."
type = list(string)

default = [
"777777777777",
"888888888888",
]
}

variable "map_roles" {
description = "Additional IAM roles to add to the aws-auth configmap."
type = list(map(string))

default = [
{
role_arn = "arn:aws:iam::66666666666:role/role1"
username = "role1"
group = "system:masters"
},
]
}

variable "map_users" {
description = "Additional IAM users to add to the aws-auth configmap."
type = list(map(string))

default = [
{
user_arn = "arn:aws:iam::66666666666:user/user1"
username = "user1"
group = "system:masters"
},
{
user_arn = "arn:aws:iam::66666666666:user/user2"
username = "user2"
group = "system:masters"
},
]
}
7 changes: 6 additions & 1 deletion build/modules/helm/helm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,15 @@ resource "helm_release" "agones" {
}

set {
name = " agones.ping.http.serviceType"
name = "agones.ping.http.serviceType"
value = "${var.ping_service_type}"
}

set {
name = "agones.ping.udp.expose"
value ="${var.udp_expose}"
}

set {
name = "agones.ping.udp.serviceType"
value = "${var.ping_service_type}"
Expand Down
4 changes: 4 additions & 0 deletions build/modules/helm/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ variable "agones_version" {
default = ""
}

variable "udp_expose" {
default = "true"
}

variable "host" {}

variable "token" {}
Expand Down
66 changes: 66 additions & 0 deletions examples/terraform-submodules/eks/module.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// Copyright 2019 Google LLC All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.


// Run:
// terraform apply [-var agones_version="0.12.0"]

// Install latest version of agones
variable "agones_version" {
default = "0.12.0"
}
variable "cluster_name" {
default = "agones-cluster"
}

variable "region" {
default = "us-west-2"
}

provider "aws" {
version = ">= 2.11"
region = var.region
}

variable "machine_type" { default = "t2.large" }

module "eks_cluster" {
source = "../../../build/modules/eks"

machine_type = "${var.machine_type}"
cluster_name = "${var.cluster_name}"
}

data "aws_eks_cluster_auth" "example" {
name = "${var.cluster_name}"
}

module "helm_agones" {
source = "../../../build/modules/helm"

udp_expose = "false"
agones_version = "${var.agones_version}"
values_file = ""
chart = "agones"
host = "${module.eks_cluster.host}"
token = "${data.aws_eks_cluster_auth.example.token}"
cluster_ca_certificate = "${module.eks_cluster.cluster_ca_certificate}"
}

output "host" {
value = "${module.eks_cluster.host}"
}
output "cluster_ca_certificate" {
value = "${module.eks_cluster.cluster_ca_certificate}"
}
Loading

0 comments on commit cd736c6

Please sign in to comment.