Add disk size and remove custom launch template (#11)

* Add disk size and remove custom launch template

---------

Signed-off-by: jayonthenet <jay@humanitec.com>
Co-authored-by: jayonthenet <jay@humanitec.com>

Author: jayonthenet

README.md

@@ -210,6 +210,7 @@ Once you are finished with the reference architecture, you can remove all provis
 | aws\_account\_id | AWS Account (ID) to use | `string` | n/a | yes |
 | aws\_region | AWS Region to deploy into | `string` | n/a | yes |
 | humanitec\_org\_id | Humanitec Organization ID | `string` | n/a | yes |
+| disk\_size | Disk size in GB to use for EKS nodes | `number` | `20` | no |
 | instance\_types | List of EC2 instances types to use for EKS nodes | `list(string)` | <pre>[<br>  "t3.large"<br>]</pre> | no |
 <!-- END_TF_DOCS -->
 

examples/with-backstage/README.md

@@ -138,6 +138,7 @@ Once you are finished with the reference architecture, you can remove all provis
 | github\_org\_id | GitHub org id | `string` | n/a | yes |
 | humanitec\_ci\_service\_user\_token | Humanitec CI Service User Token | `string` | n/a | yes |
 | humanitec\_org\_id | Humanitec Organization ID | `string` | n/a | yes |
+| disk\_size | Disk size in GB to use for EKS nodes | `number` | `20` | no |
 | instance\_types | List of EC2 instances types to use for EKS nodes | `list(string)` | <pre>[<br>  "t3.large"<br>]</pre> | no |
 | resource\_packs\_aws\_rev | Revision of the resource-packs-aws repository to use | `string` | `"refs/heads/main"` | no |
 <!-- END_TF_DOCS -->

examples/with-backstage/backstage-humanitec.tf

@@ -129,7 +129,6 @@ module "backstage_iam_policy_ecr_create_repository" {
   access_key             = module.base.aws_access_key_id
   secret_key             = module.base.aws_secret_access_key
   resource_packs_aws_rev = var.resource_packs_aws_rev
-  humanitec_organization = var.humanitec_org_id
   region                 = var.aws_region
 
   prefix = local.res_def_prefix
@@ -150,7 +149,6 @@ module "backstage_iam_role_service_account" {
   access_key             = module.base.aws_access_key_id
   secret_key             = module.base.aws_secret_access_key
   resource_packs_aws_rev = var.resource_packs_aws_rev
-  humanitec_organization = var.humanitec_org_id
   region                 = var.aws_region
 
   policy_classes = ["default"]

examples/with-backstage/main.tf

@@ -5,6 +5,7 @@ module "base" {
 
   region         = var.aws_region
   instance_types = var.instance_types
+  disk_size      = var.disk_size
 }
 
 provider "kubernetes" {

examples/with-backstage/terraform.tfvars.example

@@ -5,6 +5,9 @@ aws_account_id = ""
 # AWS region
 aws_region = ""
 
+# Disk size in GB to use for EKS nodes
+disk_size = 20
+
 # GitHub org id
 github_org_id = ""
 

examples/with-backstage/variables.tf

@@ -37,3 +37,9 @@ variable "instance_types" {
     "t3.large"
   ]
 }
+
+variable "disk_size" {
+  description = "Disk size in GB to use for EKS nodes"
+  type        = number
+  default     = 20
+}

main.tf

@@ -26,7 +26,9 @@ provider "aws" {
 module "base" {
   source = "./modules/base"
 
-  region = var.aws_region
+  region         = var.aws_region
+  instance_types = var.instance_types
+  disk_size      = var.disk_size
 }
 
 provider "kubernetes" {

modules/base/README.md

@@ -54,6 +54,7 @@ Module that provides the reference architecture.
 | <a name="input_capacity_type"></a> [capacity\_type](#input\_capacity\_type) | Defines whether to use ON\_DEMAND or SPOT EC2 instances for EKS nodes | `string` | `"ON_DEMAND"` | no |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Name for the EKS cluster | `string` | `"ref-arch"` | no |
 | <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | Version of the EKS cluster to deploy | `string` | `null` | no |
+| <a name="input_disk_size"></a> [disk\_size](#input\_disk\_size) | Disk size in GB to use for EKS nodes | `number` | `20` | no |
 | <a name="input_eks_public_access_cidrs"></a> [eks\_public\_access\_cidrs](#input\_eks\_public\_access\_cidrs) | List of CIDRs that can access the EKS cluster's public endpoint | `list(string)` | <pre>[<br>  "0.0.0.0/0"<br>]</pre> | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | Name of the environment to be deployed into | `string` | `"development"` | no |
 | <a name="input_iam_user_name"></a> [iam\_user\_name](#input\_iam\_user\_name) | Name of the IAM user to create for Humanitec EKS access | `string` | `"svc-humanitec"` | no |

modules/base/main.tf

@@ -100,6 +100,9 @@ module "aws_eks" {
 
       instance_types = var.instance_types
       capacity_type  = var.capacity_type
+
+      disk_size                  = var.disk_size
+      use_custom_launch_template = false
     }
   }
 

modules/base/variables.tf

@@ -89,3 +89,9 @@ variable "ingress_nginx_min_unavailable" {
   type        = number
   default     = 1
 }
+
+variable "disk_size" {
+  description = "Disk size in GB to use for EKS nodes"
+  type        = number
+  default     = 20
+}