chore: Param for CBCI tolerations

cloudbees-oss · Sep 30, 2024 · 9a43f28 · 9a43f28
1 parent 1f52b63
commit 9a43f28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/blueprints/02-at-scale/k8s/aws-for-fluent-bit-values.yml b/blueprints/02-at-scale/k8s/aws-for-fluent-bit-values.yml
@@ -5,9 +5,9 @@
 
 tolerations:
 - effect: "NoSchedule"
-  key: "dedicated"
+  key: "${cbciAppsTolerationKey}"
   operator: "Equal"
-  value: "cb-apps"
+  value: "${cbciAppsTolerationValue}"
 - effect: "NoSchedule"
   key: "dedicated"
   operator: "Equal"

diff --git a/blueprints/02-at-scale/main.k8s.tf b/blueprints/02-at-scale/main.k8s.tf
@@ -252,9 +252,11 @@ module "eks_blueprints_addons" {
     namespace = local.observability_ns
     create_namespace = true
     values = [templatefile("k8s/aws-for-fluent-bit-values.yml", {
-      region             = var.aws_region
-      bucketName         = module.cbci_s3_bucket.s3_bucket_id
-      log_retention_days = local.cloudwatch_logs_expiration_days
+      region                  = var.aws_region
+      bucketName              = module.cbci_s3_bucket.s3_bucket_id
+      log_retention_days      = local.cloudwatch_logs_expiration_days
+      cbciAppsTolerationKey   = local.mng["cbci_apps"]["taints"].key
+      cbciAppsTolerationValue = local.mng["cbci_apps"]["taints"].value
     })]
     kubelet_monitoring = true
     chart_version      = "0.1.28"