From 13cb55528c3d931f3aefb092af9f511fe6abd29c Mon Sep 17 00:00:00 2001 From: Pascal Bourdier Date: Fri, 24 Sep 2021 12:47:28 +0200 Subject: [PATCH] fix: Fixed launch_templates_with_managed_node_group example (#1599) --- .../disk_encryption_policy.tf | 1 + .../launchtemplate.tf | 2 -- .../launch_templates_with_managed_node_groups/main.tf | 2 ++ .../variables.tf | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/examples/launch_templates_with_managed_node_groups/disk_encryption_policy.tf b/examples/launch_templates_with_managed_node_groups/disk_encryption_policy.tf index 0362193..3f834ad 100644 --- a/examples/launch_templates_with_managed_node_groups/disk_encryption_policy.tf +++ b/examples/launch_templates_with_managed_node_groups/disk_encryption_policy.tf @@ -2,6 +2,7 @@ resource "aws_iam_service_linked_role" "autoscaling" { aws_service_name = "autoscaling.amazonaws.com" description = "Default Service-Linked Role enables access to AWS Services and Resources used or managed by Auto Scaling" + custom_suffix = "lt_with_managed_node_groups" # the full name is "AWSServiceRoleForAutoScaling_lt_with_managed_node_groups" < 64 characters } #data "aws_caller_identity" "current" {} diff --git a/examples/launch_templates_with_managed_node_groups/launchtemplate.tf b/examples/launch_templates_with_managed_node_groups/launchtemplate.tf index a393770..a2840eb 100644 --- a/examples/launch_templates_with_managed_node_groups/launchtemplate.tf +++ b/examples/launch_templates_with_managed_node_groups/launchtemplate.tf @@ -37,8 +37,6 @@ resource "aws_launch_template" "default" { } } - instance_type = var.instance_type - monitoring { enabled = true } diff --git a/examples/launch_templates_with_managed_node_groups/main.tf b/examples/launch_templates_with_managed_node_groups/main.tf index 78c2b31..833b4b9 100644 --- a/examples/launch_templates_with_managed_node_groups/main.tf +++ b/examples/launch_templates_with_managed_node_groups/main.tf @@ -62,6 +62,8 @@ module "eks" { launch_template_id = aws_launch_template.default.id launch_template_version = aws_launch_template.default.default_version + instance_types = var.instance_types + additional_tags = { CustomTag = "EKS example" } diff --git a/examples/launch_templates_with_managed_node_groups/variables.tf b/examples/launch_templates_with_managed_node_groups/variables.tf index 351ffdb..9bd936c 100644 --- a/examples/launch_templates_with_managed_node_groups/variables.tf +++ b/examples/launch_templates_with_managed_node_groups/variables.tf @@ -1,6 +1,6 @@ -variable "instance_type" { - description = "Instance type" +variable "instance_types" { + description = "Instance types" # Smallest recommended, where ~1.1Gb of 2Gb memory is available for the Kubernetes pods after ‘warming up’ Docker, Kubelet, and OS - type = string - default = "t3.small" + type = list(string) + default = ["t3.small"] }