Skip to content

Commit cd9a391

Browse files
feat: Add support for setting cluster_version in EKS managed node group sub-module (#470)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent f3bf77e commit cd9a391

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.0.1
3+
rev: v4.2.0
44
hooks:
55
- id: trailing-whitespace
66
args: ['--markdown-linebreak-ext=md']
@@ -10,7 +10,7 @@ repos:
1010
- id: detect-aws-credentials
1111
args: ['--allow-missing-credentials']
1212
- repo: https://github.com/antonbabenko/pre-commit-terraform
13-
rev: v1.53.0
13+
rev: v1.68.1
1414
hooks:
1515
- id: terraform_fmt
1616
- id: terraform_validate

eks-worker.tf

+3-7
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
module "aws_eks_managed_node_groups" {
66
source = "./modules/aws-eks-managed-node-groups"
77

8-
for_each = { for key, value in var.managed_node_groups : key => value
9-
if length(var.managed_node_groups) > 0
10-
}
8+
for_each = var.managed_node_groups
119

1210
managed_ng = each.value
1311
context = local.node_group_context
@@ -22,9 +20,7 @@ module "aws_eks_managed_node_groups" {
2220
module "aws_eks_self_managed_node_groups" {
2321
source = "./modules/aws-eks-self-managed-node-groups"
2422

25-
for_each = { for key, value in var.self_managed_node_groups : key => value
26-
if length(var.self_managed_node_groups) > 0
27-
}
23+
for_each = var.self_managed_node_groups
2824

2925
self_managed_ng = each.value
3026
context = local.node_group_context
@@ -39,7 +35,7 @@ module "aws_eks_self_managed_node_groups" {
3935
module "aws_eks_fargate_profiles" {
4036
source = "./modules/aws-eks-fargate-profiles"
4137

42-
for_each = { for k, v in var.fargate_profiles : k => v if length(var.fargate_profiles) > 0 }
38+
for_each = var.fargate_profiles
4339

4440
fargate_profile = each.value
4541
context = local.fargate_context

modules/aws-eks-managed-node-groups/main.tf

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ resource "aws_eks_node_group" "managed_ng" {
1313
disk_size = local.managed_node_group["create_launch_template"] == true ? null : local.managed_node_group["disk_size"]
1414
instance_types = local.managed_node_group["instance_types"]
1515
force_update_version = local.managed_node_group["force_update_version"]
16+
version = var.context.cluster_version
1617

1718
scaling_config {
1819
desired_size = local.managed_node_group["desired_size"]

0 commit comments

Comments
 (0)