Skip to content

Commit ac91f0a

Browse files
committed
fix: Remove data plane compute *_defaults variables that do not work with variable optional attributes
1 parent 8299db5 commit ac91f0a

File tree

6 files changed

+283
-1026
lines changed

6 files changed

+283
-1026
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Large diffs are not rendered by default.

node_groups.tf

Lines changed: 202 additions & 205 deletions
Large diffs are not rendered by default.

tests/eks-fargate-profile/main.tf

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ module "eks" {
5454
create_security_group = false
5555
create_node_security_group = false
5656

57-
fargate_profile_defaults = {
58-
iam_role_additional_policies = {
59-
additional = aws_iam_policy.additional.arn
60-
}
61-
}
62-
6357
fargate_profiles = {
6458
example = {
6559
name = "example"
@@ -78,6 +72,10 @@ module "eks" {
7872
}
7973
]
8074

75+
iam_role_additional_policies = {
76+
additional = aws_iam_policy.additional.arn
77+
}
78+
8179
# Using specific subnets instead of the subnets supplied for the cluster itself
8280
subnet_ids = [module.vpc.private_subnets[1]]
8381

tests/eks-managed-node-group/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ module "eks" {
8787
subnet_ids = module.vpc.private_subnets
8888
control_plane_subnet_ids = module.vpc.intra_subnets
8989

90-
eks_managed_node_group_defaults = {
91-
ami_type = "AL2023_x86_64_STANDARD"
92-
instance_types = ["m6i.large", "m5.large", "m5n.large", "m5zn.large"]
93-
}
94-
9590
eks_managed_node_groups = {
9691
# Default node group - as provided by AWS EKS
9792
default_node_group = {

tests/self-managed-node-group/main.tf

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,18 @@ module "eks" {
7070
provider_key_arn = module.kms.key_arn
7171
}
7272

73-
self_managed_node_group_defaults = {
74-
ami_type = "AL2023_x86_64_STANDARD"
75-
ami_id = data.aws_ami.eks_default.image_id
76-
77-
# enable discovery of autoscaling groups by cluster-autoscaler
78-
autoscaling_group_tags = {
79-
"k8s.io/cluster-autoscaler/enabled" : true,
80-
"k8s.io/cluster-autoscaler/${local.name}" : "owned",
81-
}
82-
}
83-
8473
self_managed_node_groups = {
8574
# Default node group - as provisioned by the module defaults
86-
default_node_group = {}
75+
default_node_group = {
76+
ami_type = "AL2023_x86_64_STANDARD"
77+
ami_id = data.aws_ami.eks_default.image_id
78+
79+
# enable discovery of autoscaling groups by cluster-autoscaler
80+
autoscaling_group_tags = {
81+
"k8s.io/cluster-autoscaler/enabled" : true,
82+
"k8s.io/cluster-autoscaler/${local.name}" : "owned",
83+
}
84+
}
8785

8886
# Bottlerocket node group
8987
bottlerocket = {

0 commit comments

Comments
 (0)