🐛 fix(tags): revert tag changes

SCT-Engineering · Oct 11, 2024 · 447eb59 · 447eb59
1 parent 581f06f
commit 447eb59
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,7 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the
 | [kubectl_manifest.karpenter_node_pool](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
 | [aws_arn.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/arn) | data source |
 | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
+| [aws_default_tags.default_tags](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/default_tags) | data source |
 | [aws_ecr_image.karpenter_image](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_image) | data source |
 | [aws_ecr_image.kubectl_image](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_image) | data source |
 

diff --git a/aws_data.tf b/aws_data.tf
@@ -3,3 +3,5 @@ data "aws_caller_identity" "current" {}
 data "aws_arn" "current" {
   arn = data.aws_caller_identity.current.arn
 }
+
+data "aws_default_tags" "default_tags" {}
diff --git a/main.tf b/main.tf
@@ -51,27 +51,27 @@ resource "helm_release" "karpenter" {
   create_namespace = true
 
   set {
-    name  = "affinity.nodeAffinity.preferredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key"
+    name  = "affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key"
     value = "karpenter.sh/nodepool"
   }
   set {
-    name  = "affinity.nodeAffinity.preferredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator"
+    name  = "affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator"
     value = "DoesNotExist"
   }
   set {
-    name  = "affinity.nodeAffinity.preferredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[1].matchExpressions[0].key"
+    name  = "affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[1].matchExpressions[0].key"
     value = "eks.amazonaws.com/nodegroup"
   }
   set {
-    name  = "affinity.nodeAffinity.preferredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[1].matchExpressions[0].operator"
+    name  = "affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[1].matchExpressions[0].operator"
     value = "In"
   }
   set {
-    name  = "affinity.nodeAffinity.preferredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[1].matchExpressions[0].values[0]"
+    name  = "affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[1].matchExpressions[0].values[0]"
     value = var.karpenter_node_group_name
   }
   set {
-    name  = "affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].topologyKey"
+    name  = "affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution[0].topologyKey"
     value = "kubernetes.io/hostname"
   }
   set {
@@ -169,7 +169,7 @@ resource "kubectl_manifest" "karpenter_ec2_node_class" {
   ]
   yaml_body = templatefile("${path.module}/ec2_node_class.yaml.tpl", {
     cluster_name   = var.cluster_name
-    tags           = var.tags
+    tags           = jsonencode(data.aws_default_tags.default_tags.tags)
     amd_ami_family = "Bottlerocket"
     amd_ami_alias  = "bottlerocket"
     subnets_name   = local.container_subnets_name