github-mirrors/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-aws-eks.git synced 2026-03-24 10:21:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: Propagate ami_type to self-managed node group; allow using ami_type only (#3030)

Browse Source
This commit is contained in:
Bryant Biggs
2024-05-08 08:04:19 -04:00
committed by GitHub
parent afadb14e44
commit 74d39187d8
30 changed files with 239 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
examples/user_data/main.tf
View File

@@ -108,7 +108,7 @@ module "eks_mng_al2_custom_template" {
module "eks_mng_al2023_no_op" {
source = "../../modules/_user_data"
platform = "al2023"
ami_type = "AL2023_x86_64_STANDARD"
# Hard requirement
cluster_service_cidr = local.cluster_service_cidr
@@ -117,7 +117,7 @@ module "eks_mng_al2023_no_op" {
module "eks_mng_al2023_additional" {
source = "../../modules/_user_data"
platform = "al2023"
ami_type = "AL2023_x86_64_STANDARD"
# Hard requirement
cluster_service_cidr = local.cluster_service_cidr
@@ -141,7 +141,7 @@ module "eks_mng_al2023_additional" {
module "eks_mng_al2023_custom_ami" {
source = "../../modules/_user_data"
platform = "al2023"
ami_type = "AL2023_x86_64_STANDARD"
cluster_name = local.name
cluster_endpoint = local.cluster_endpoint
@@ -176,7 +176,7 @@ module "eks_mng_al2023_custom_ami" {
module "eks_mng_al2023_custom_template" {
source = "../../modules/_user_data"
platform = "al2023"
ami_type = "AL2023_x86_64_STANDARD"
cluster_name = local.name
cluster_endpoint = local.cluster_endpoint
@@ -216,7 +216,7 @@ module "eks_mng_al2023_custom_template" {
module "eks_mng_bottlerocket_no_op" {
source = "../../modules/_user_data"
platform = "bottlerocket"
ami_type = "BOTTLEROCKET_x86_64"
# Hard requirement
cluster_service_cidr = local.cluster_service_cidr
@@ -225,7 +225,7 @@ module "eks_mng_bottlerocket_no_op" {
module "eks_mng_bottlerocket_additional" {
source = "../../modules/_user_data"
platform = "bottlerocket"
ami_type = "BOTTLEROCKET_x86_64"
cluster_service_cidr = local.cluster_service_cidr
bootstrap_extra_args = <<-EOT
@@ -238,7 +238,7 @@ module "eks_mng_bottlerocket_additional" {
module "eks_mng_bottlerocket_custom_ami" {
source = "../../modules/_user_data"
platform = "bottlerocket"
ami_type = "BOTTLEROCKET_x86_64"
cluster_name = local.name
cluster_endpoint = local.cluster_endpoint
@@ -257,7 +257,7 @@ module "eks_mng_bottlerocket_custom_ami" {
module "eks_mng_bottlerocket_custom_template" {
source = "../../modules/_user_data"
platform = "bottlerocket"
ami_type = "BOTTLEROCKET_x86_64"
cluster_name = local.name
cluster_endpoint = local.cluster_endpoint
@@ -281,7 +281,7 @@ module "eks_mng_bottlerocket_custom_template" {
module "eks_mng_windows_no_op" {
source = "../../modules/_user_data"
platform = "windows"
ami_type = "WINDOWS_CORE_2022_x86_64"
# Hard requirement
cluster_service_cidr = local.cluster_service_cidr
@@ -290,7 +290,7 @@ module "eks_mng_windows_no_op" {
module "eks_mng_windows_additional" {
source = "../../modules/_user_data"
platform = "windows"
ami_type = "WINDOWS_CORE_2022_x86_64"
# Hard requirement
cluster_service_cidr = local.cluster_service_cidr
@@ -303,7 +303,7 @@ module "eks_mng_windows_additional" {
module "eks_mng_windows_custom_ami" {
source = "../../modules/_user_data"
platform = "windows"
ami_type = "WINDOWS_CORE_2022_x86_64"
cluster_name = local.name
cluster_endpoint = local.cluster_endpoint
@@ -327,7 +327,7 @@ module "eks_mng_windows_custom_ami" {
module "eks_mng_windows_custom_template" {
source = "../../modules/_user_data"
platform = "windows"
ami_type = "WINDOWS_CORE_2022_x86_64"
cluster_name = local.name
cluster_endpoint = local.cluster_endpoint
@@ -443,7 +443,7 @@ module "self_mng_al2_custom_template" {
module "self_mng_al2023_no_op" {
source = "../../modules/_user_data"
platform = "al2023"
ami_type = "AL2023_x86_64_STANDARD"
is_eks_managed_node_group = false
@@ -454,7 +454,7 @@ module "self_mng_al2023_no_op" {
module "self_mng_al2023_bootstrap" {
source = "../../modules/_user_data"
platform = "al2023"
ami_type = "AL2023_x86_64_STANDARD"
enable_bootstrap_user_data = true
is_eks_managed_node_group = false
@@ -490,7 +490,7 @@ module "self_mng_al2023_bootstrap" {
module "self_mng_al2023_custom_template" {
source = "../../modules/_user_data"
platform = "al2023"
ami_type = "AL2023_x86_64_STANDARD"
enable_bootstrap_user_data = true
is_eks_managed_node_group = false
@@ -532,7 +532,7 @@ module "self_mng_al2023_custom_template" {
module "self_mng_bottlerocket_no_op" {
source = "../../modules/_user_data"
platform = "bottlerocket"
ami_type = "BOTTLEROCKET_x86_64"
is_eks_managed_node_group = false
@@ -543,7 +543,7 @@ module "self_mng_bottlerocket_no_op" {
module "self_mng_bottlerocket_bootstrap" {
source = "../../modules/_user_data"
platform = "bottlerocket"
ami_type = "BOTTLEROCKET_x86_64"
enable_bootstrap_user_data = true
is_eks_managed_node_group = false
@@ -565,7 +565,7 @@ module "self_mng_bottlerocket_bootstrap" {
module "self_mng_bottlerocket_custom_template" {
source = "../../modules/_user_data"
platform = "bottlerocket"
ami_type = "BOTTLEROCKET_x86_64"
enable_bootstrap_user_data = true
is_eks_managed_node_group = false
@@ -593,7 +593,7 @@ module "self_mng_bottlerocket_custom_template" {
module "self_mng_windows_no_op" {
source = "../../modules/_user_data"
platform = "windows"
ami_type = "WINDOWS_CORE_2022_x86_64"
is_eks_managed_node_group = false
@@ -604,7 +604,7 @@ module "self_mng_windows_no_op" {
module "self_mng_windows_bootstrap" {
source = "../../modules/_user_data"
platform = "windows"
ami_type = "WINDOWS_CORE_2022_x86_64"
enable_bootstrap_user_data = true
is_eks_managed_node_group = false
@@ -630,7 +630,7 @@ module "self_mng_windows_bootstrap" {
module "self_mng_windows_custom_template" {
source = "../../modules/_user_data"
platform = "windows"
ami_type = "WINDOWS_CORE_2022_x86_64"
enable_bootstrap_user_data = true
is_eks_managed_node_group = false