Update resource exclusions for Datadog agent (#6)

osinfra-io · Sep 6, 2024 · a6c0f0e · a6c0f0e
1 parent 959ce9a
commit a6c0f0e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/regional/manifests/locals.tf b/regional/manifests/locals.tf
@@ -99,7 +99,7 @@ locals {
   node_agent_env_vars = [
     {
       name  = "DD_CONTAINER_EXCLUDE"
-      value = "kube_namespace:^datadog$ kube_namespace:^gke-mcs$"
+      value = "kube_namespace:^gke-managed-cim$ kube_namespace:^gke-managed-system kube_namespace:^gke-mcs$ kube_namespace:^gmp-system$ kube_namespace:^kube-node-lease$ kube_namespace:^kube-public$ kube_namespace:^kube-system$"
     },
     {
       name  = "DD_IGNORE_AUTOCONF"

diff --git a/regional/manifests/main.tf b/regional/manifests/main.tf
@@ -101,11 +101,11 @@ resource "kubernetes_manifest" "agent" {
             }
 
             trace-agent = {
-              env = concat(local.trace_agent_env_vars, var.trace_agent_env_vars)
+              env = local.trace_agent_env_vars
             }
           }
 
-          env = concat(local.node_agent_env_vars, var.node_agent_env_vars)
+          env = local.node_agent_env_vars
 
           extraConfd = {
             configDataMap = {

diff --git a/regional/manifests/variables.tf b/regional/manifests/variables.tf
@@ -135,15 +135,6 @@ variable "limits_memory" {
   default     = "256Mi"
 }
 
-variable "node_agent_env_vars" {
-  description = "Environment variables for the Datadog nodeAgent"
-  type = list(object({
-    name  = string
-    value = string
-  }))
-  default = []
-}
-
 variable "node_agent_image" {
   description = "Image for the Datadog node agent, relative to datadog"
   type        = string
@@ -199,12 +190,3 @@ variable "team" {
   description = "Team name to be used as a tag in Datadog"
   type        = string
 }
-
-variable "trace_agent_env_vars" {
-  description = "Environment variables for the Datadog trace-agent"
-  type = list(object({
-    name  = string
-    value = string
-  }))
-  default = []
-}