Skip to content

Commit

Permalink
update bastion machine type to variable in AWS HA terraform (#47297)
Browse files Browse the repository at this point in the history
* update bastion machine type to variable in AWS HA terraform

* Include instance type variables in README and Makefile for AWS HA terraform

* update comments and spacing for aws ha terraform

Co-authored-by: Gus Luxton <gus@goteleport.com>

* fix variable assignment for Makefile,README in aws ha terraform

---------

Co-authored-by: Gus Luxton <gus@goteleport.com>
  • Loading branch information
stevenGravy and webvictim authored Oct 8, 2024
1 parent 9e099ea commit 47c22ee
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 1 deletion.
17 changes: 17 additions & 0 deletions examples/aws/terraform/ha-autoscale-cluster/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,23 @@ TF_VAR_license_path ?=
# FIPS 140-2 images are also available for Enterprise customers, look for '-fips' on the end of the AMI's name
TF_VAR_ami_name ?=


# Instance types used for authentication server auto scaling group
# This should match to the AMI instance architecture type, ARM or x86
TF_VAR_auth_instance_type ?= m7g.large

# Instance types used for proxy server auto scaling group
# This should match to the AMI instance architecture type, ARM or x86
TF_VAR_proxy_instance_type ?= m7g.large

# Instance types used for Teleport node auto scaling group
# This should match to the AMI instance architecture type, ARM or x86
TF_VAR_node_instance_type ?= t4g.medium

# Instance type used for bastion server
# This should match to the AMI instance architecture type, ARM or x86
TF_VAR_bastion_instance_type ?= t4g.medium

# Route 53 zone to use, should be the zone registered in AWS, e.g. example.com
TF_VAR_route53_zone ?=

Expand Down
16 changes: 16 additions & 0 deletions examples/aws/terraform/ha-autoscale-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,22 @@ export TF_VAR_cluster_name="teleport.example.com"
# FIPS 140-2 images are also available for Enterprise customers, look for '-fips' on the end of the AMI's name
export TF_VAR_ami_name="teleport-ent-16.4.2-arm64"

# Instance types used for authentication server auto scaling group
# This should match to the AMI instance architecture type, ARM or x86
TF_VAR_auth_instance_type ?= m7g.large

# Instance types used for proxy auto scaling group
# This should match to the AMI instance architecture type, ARM or x86
TF_VAR_proxy_instance_type ?= m7g.large

# Instance types used for Teleport node auto scaling group
# This should match to the AMI instance architecture type, ARM or x86
TF_VAR_node_instance_type ?= t4g.medium

# Instance type used for bastion server
# This should match to the AMI instance architecture type, ARM or x86
TF_VAR_bastion_instance_type ?= t4g.medium

# AWS SSH key name to provision in installed instances, should be available in the region
export TF_VAR_key_name="example"

Expand Down
2 changes: 1 addition & 1 deletion examples/aws/terraform/ha-autoscale-cluster/bastion.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
resource "aws_instance" "bastion" {
count = "1"
ami = data.aws_ami.base.id
instance_type = "t4g.medium"
instance_type = var.bastion_instance_type
key_name = var.key_name
associate_public_ip_address = true
source_dest_check = false
Expand Down
6 changes: 6 additions & 0 deletions examples/aws/terraform/ha-autoscale-cluster/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ variable "node_instance_type" {
default = "t4g.medium"
}

// Instance type used for bastion server
variable "bastion_instance_type" {
type = string
default = "t4g.medium"
}

// SSH key name to provision instances withx
variable "key_name" {
type = string
Expand Down

0 comments on commit 47c22ee

Please sign in to comment.