Merge branch 'main' of github.com:phidatalab/RADAR-K8s-Infrastructure

RADAR-base · Feb 7, 2024 · 6800ff5 · 6800ff5
2 parents 814d0d1 + 005785d
commit 6800ff5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/cluster/eks.tf b/cluster/eks.tf
@@ -53,7 +53,7 @@ module "eks" {
           {
             key : "dmz-pod",
             operator : "Equal",
-            value : "false",
+            value : "yes",
             effect : "NoExecute"
           }
         ],
@@ -126,9 +126,10 @@ module "eks" {
 
       # Do we need this in the general template?
       taints = [{
-        key    = "dmz-pod"
-        value  = "false"
-        effect = "NO_EXECUTE"
+        key      = "dmz-pod"
+        operator = "Equal"
+        value    = "yes"
+        effect   = "NO_EXECUTE"
       }]
 
       instance_types = var.instance_types

diff --git a/config/karpenter.tf b/config/karpenter.tf
@@ -50,6 +50,32 @@ resource "helm_release" "karpenter" {
     name  = "settings.aws.interruptionQueueName"
     value = module.karpenter[0].queue_name
   }
+
+  set {
+    name  = "replicas"
+    value = 1 # The initial value should match var.dmz_node_size["desired"] defined in cluster/variables.tf
+  }
+
+  set {
+    name  = "tolerations[0].key"
+    value = "dmz-pod"
+  }
+
+  set {
+    name  = "tolerations[0].value"
+    value = "yes"
+  }
+
+  set {
+    name  = "tolerations[0].operator"
+    value = "Equal"
+  }
+
+  set {
+    name  = "tolerations[0].effect"
+    value = "NoExecute"
+  }
+
 }
 
 resource "kubectl_manifest" "karpenter_provisioner" {