From 54417d244c06b459b399e84433343af6e9934bb3 Mon Sep 17 00:00:00 2001
From: petros-d <46783518+petros-d@users.noreply.github.com>
Date: Wed, 12 Apr 2023 23:05:33 +0100
Subject: [PATCH] feat: Add support for allowed_instance_type (#2552)
---
modules/self-managed-node-group/README.md | 4 ++--
modules/self-managed-node-group/main.tf | 16 +++++++++++++---
modules/self-managed-node-group/versions.tf | 2 +-
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/modules/self-managed-node-group/README.md b/modules/self-managed-node-group/README.md
index f505e09fd3..a9eff4772e 100644
--- a/modules/self-managed-node-group/README.md
+++ b/modules/self-managed-node-group/README.md
@@ -43,13 +43,13 @@ module "self_managed_node_group" {
| Name | Version |
|------|---------|
| [terraform](#requirement\_terraform) | >= 1.0 |
-| [aws](#requirement\_aws) | >= 4.47 |
+| [aws](#requirement\_aws) | >= 4.57 |
## Providers
| Name | Version |
|------|---------|
-| [aws](#provider\_aws) | >= 4.47 |
+| [aws](#provider\_aws) | >= 4.57 |
## Modules
diff --git a/modules/self-managed-node-group/main.tf b/modules/self-managed-node-group/main.tf
index 9b72f49a9f..049e32dfca 100644
--- a/modules/self-managed-node-group/main.tf
+++ b/modules/self-managed-node-group/main.tf
@@ -197,8 +197,9 @@ resource "aws_launch_template" "this" {
}
}
- accelerator_types = try(instance_requirements.value.accelerator_types, [])
- bare_metal = try(instance_requirements.value.bare_metal, null)
+ accelerator_types = try(instance_requirements.value.accelerator_types, [])
+ allowed_instance_types = try(instance_requirements.value.allowed_instance_types, null)
+ bare_metal = try(instance_requirements.value.bare_metal, null)
dynamic "baseline_ebs_bandwidth_mbps" {
for_each = try([instance_requirements.value.baseline_ebs_bandwidth_mbps], [])
@@ -211,7 +212,7 @@ resource "aws_launch_template" "this" {
burstable_performance = try(instance_requirements.value.burstable_performance, null)
cpu_manufacturers = try(instance_requirements.value.cpu_manufacturers, [])
- excluded_instance_types = try(instance_requirements.value.excluded_instance_types, [])
+ excluded_instance_types = try(instance_requirements.value.excluded_instance_types, null)
instance_generations = try(instance_requirements.value.instance_generations, [])
local_storage = try(instance_requirements.value.local_storage, null)
local_storage_types = try(instance_requirements.value.local_storage_types, [])
@@ -234,6 +235,15 @@ resource "aws_launch_template" "this" {
}
}
+ dynamic "network_bandwidth_gbps" {
+ for_each = try([instance_requirements.value.network_bandwidth_gbps], [])
+
+ content {
+ max = try(network_bandwidth_gbps.value.max, null)
+ min = try(network_bandwidth_gbps.value.min, null)
+ }
+ }
+
dynamic "network_interface_count" {
for_each = try([instance_requirements.value.network_interface_count], [])
diff --git a/modules/self-managed-node-group/versions.tf b/modules/self-managed-node-group/versions.tf
index 55eff62b09..01d187af62 100644
--- a/modules/self-managed-node-group/versions.tf
+++ b/modules/self-managed-node-group/versions.tf
@@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
- version = ">= 4.47"
+ version = ">= 4.57"
}
}
}