EKS: Allow setting additional tags and labels for node pools

Author: pst

aws/_modules/eks/node_pool/main.tf

@@ -13,8 +13,8 @@ resource "aws_eks_node_group" "nodes" {
   instance_types = var.instance_types
   disk_size      = var.disk_size
 
-  tags   = var.eks_metadata_tags
-  labels = var.metadata_labels
+  tags   = merge(var.tags, var.eks_metadata_tags)
+  labels = merge(var.labels, var.metadata_labels)
 
   dynamic "taint" {
     for_each = var.taints

aws/_modules/eks/node_pool/variables.tf

@@ -67,3 +67,15 @@ variable "taints" {
   }))
   description = "Kubernetes taints to set for node pool."
 }
+
+variable "tags" {
+  type        = map(string)
+  description = "AWS tags to set on the node pool. Merged with Kubestack default tags."
+  default     = {}
+}
+
+variable "labels" {
+  type        = map(string)
+  description = "Kubernetes labels to set on the nodes created by the node pool. Merged with Kubestack default labels."
+  default     = {}
+}

aws/cluster/node-pool/configuration.tf

@@ -28,4 +28,8 @@ locals {
   vpc_subnet_map_public_ip = lookup(local.cfg, "vpc_subnet_map_public_ip", null)
 
   taints = local.cfg["taints"] == null ? toset([]) : local.cfg["taints"]
+
+  tags = local.cfg["tags"]
+
+  labels = local.cfg["labels"]
 }

aws/cluster/node-pool/main.tf

@@ -19,5 +19,9 @@ module "node_pool" {
 
   taints = local.taints
 
+  tags = local.tags
+
+  labels = local.labels
+
   depends-on-aws-auth = null
 }

aws/cluster/node-pool/variables.tf

@@ -28,6 +28,10 @@ variable "configuration" {
       value  = string
       effect = string
     })))
+
+    tags = optional(map(string))
+
+    labels = optional(map(string))
   }))
   description = "Map with per workspace module configuration."
 }

tests/eks_zero_node_pools.tf

@@ -16,6 +16,15 @@ module "eks_zero_node_pool_existing_subnets" {
       desired_capacity = 1
       min_size         = 1
       max_size         = 3
+
+      tags = {
+        "k8s.io/cluster-autoscaler/node-template/label/nvidia.com/gpu" = true
+        "k8s.io/cluster-autoscaler/node-template/taint/dedicated"      = "nvidia.com/gpu=true"
+      }
+
+      labels = {
+        "kubestack.com/test" = true
+      }
     }
 
     # Settings for Ops-cluster