File tree Expand file tree Collapse file tree 3 files changed +20
-14
lines changed Expand file tree Collapse file tree 3 files changed +20
-14
lines changed Original file line number Diff line number Diff line change @@ -12,10 +12,11 @@ locals {
1212 }
1313 ]
1414 karpenter_node_role = aws_iam_role.workers.name
15- karpenter_security_group_selector_maps = flatten (concat ([{
16- " id" = module.eks.cluster_primary_security_group_id
17- }, local . additional_karpenter_security_group_id_maps
18- ]))
15+ karpenter_security_group_selector_maps = [{
16+ tags = merge ({
17+ " karpenter.sh/discovery" = module.eks.cluster_name
18+ }, var. additional_karpenter_security_group_selector_tags )
19+ }]
1920 karpenter_node_metadata_options = {
2021 httpEndpoint = " enabled"
2122 httpProtocolIPv6 = var.cluster_ip_family != " ipv6" ? " disabled" : " enabled"
@@ -54,12 +55,6 @@ locals {
5455 },
5556 ])
5657
57- additional_karpenter_security_group_id_maps = [
58- for val in var . additional_karpenter_security_group_ids : {
59- " id" = val
60- }
61- ]
62-
6358 # Kaprenter Upgrade
6459 karpenter_upgrade_nodeclasses = concat ([
6560 for nodeclass in local . karpenter_nodeclasses : merge (nodeclass, {
Original file line number Diff line number Diff line change @@ -73,6 +73,10 @@ locals {
7373 }
7474 }
7575 addon_aws_ebs_csi_driver_lookup = var. enable_pod_identity_for_eks_addons ? " pod_identity" : " irsa"
76+
77+ node_security_group_tags = merge ({
78+ " karpenter.sh/discovery" = var.cluster_name
79+ }, var. node_security_group_tags )
7680}
7781# tfsec:ignore:aws-eks-no-public-cluster-access-to-cidr
7882# tfsec:ignore:aws-eks-no-public-cluster-access
@@ -130,6 +134,7 @@ module "eks" {
130134 }
131135 }, var. node_security_group_additional_rules )
132136 node_security_group_enable_recommended_rules = var. node_security_group_enable_recommended_rules
137+ node_security_group_tags = local. node_security_group_tags
133138
134139 create_kms_key = false # Created in kms.tf
135140 cluster_encryption_config = {
Original file line number Diff line number Diff line change @@ -195,6 +195,12 @@ variable "create_node_security_group" {
195195 default = true
196196}
197197
198+ variable "node_security_group_tags" {
199+ description = " A map of additional tags to add to the node security group created"
200+ type = map (string )
201+ default = {}
202+ }
203+
198204variable "worker_security_group_name" {
199205 description = " Worker security group name"
200206 type = string
@@ -576,10 +582,10 @@ variable "karpenter_default_subnet_selector_tags" {
576582 }
577583}
578584
579- variable "additional_karpenter_security_group_ids " {
580- description = " Additional security group IDs to add to the Karpenter node groups"
581- type = list (string )
582- default = []
585+ variable "additional_karpenter_security_group_selector_tags " {
586+ description = " Additional security group tags to add to the Karpenter node groups"
587+ type = map (string )
588+ default = {}
583589}
584590
585591variable "karpenter_pod_resources" {
You can’t perform that action at this time.
0 commit comments