fix: Default to cluster version for EKS and self managed node groups when a cluster_version is not specified (#1963)

This commit is contained in:
Bryant Biggs
2022-03-24 10:56:55 -04:00
committed by GitHub
parent 7369f8a19e
commit fd3a3e9a96
5 changed files with 14 additions and 10 deletions

View File

@@ -231,7 +231,7 @@ module "eks_managed_node_group" {
create = try(each.value.create, true)
cluster_name = aws_eks_cluster.this[0].name
cluster_version = try(each.value.cluster_version, var.eks_managed_node_group_defaults.cluster_version, var.cluster_version)
cluster_version = try(each.value.cluster_version, var.eks_managed_node_group_defaults.cluster_version, aws_eks_cluster.this[0].version)
cluster_security_group_id = local.cluster_security_group_id
cluster_ip_family = var.cluster_ip_family
@@ -402,7 +402,7 @@ module "self_managed_node_group" {
ebs_optimized = try(each.value.ebs_optimized, var.self_managed_node_group_defaults.ebs_optimized, null)
ami_id = try(each.value.ami_id, var.self_managed_node_group_defaults.ami_id, "")
cluster_version = try(each.value.cluster_version, var.self_managed_node_group_defaults.cluster_version, var.cluster_version)
cluster_version = try(each.value.cluster_version, var.self_managed_node_group_defaults.cluster_version, aws_eks_cluster.this[0].version)
instance_type = try(each.value.instance_type, var.self_managed_node_group_defaults.instance_type, "m6i.large")
key_name = try(each.value.key_name, var.self_managed_node_group_defaults.key_name, null)