From 09bd158e3eb470d6523458dc3bc7917a7193b0a3 Mon Sep 17 00:00:00 2001 From: Fanny Jiang Date: Fri, 25 Oct 2024 15:29:02 -0400 Subject: [PATCH] fix mapping --- tools/helm-operator-mapper/main.go | 2 +- .../mapping_datadog_helm_to_datadogagent_crd.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/helm-operator-mapper/main.go b/tools/helm-operator-mapper/main.go index d819e27f6..bc52cfb59 100644 --- a/tools/helm-operator-mapper/main.go +++ b/tools/helm-operator-mapper/main.go @@ -125,7 +125,7 @@ func main() { return } - if mappingFile != defaultDDAMappingPath { + if sourceFile != defaultDDAMappingPath { newMapYaml = `# This file maps keys from the Datadog Helm chart (YAML) to the DatadogAgent CustomResource spec (YAML). ` + newMapYaml } diff --git a/tools/helm-operator-mapper/mapping_datadog_helm_to_datadogagent_crd.yaml b/tools/helm-operator-mapper/mapping_datadog_helm_to_datadogagent_crd.yaml index e264335f1..d1a08f93a 100644 --- a/tools/helm-operator-mapper/mapping_datadog_helm_to_datadogagent_crd.yaml +++ b/tools/helm-operator-mapper/mapping_datadog_helm_to_datadogagent_crd.yaml @@ -1,3 +1,4 @@ +# This file maps keys from the Datadog Helm chart (YAML) to the DatadogAgent CustomResource spec (YAML). agents.additionalLabels: spec.override.nodeAgent.labels agents.affinity: spec.override.nodeAgent.affinity agents.containers.agent.env: spec.override.nodeAgent.containers.agent.env @@ -393,6 +394,7 @@ datadog.orchestratorExplorer.customResources: spec.features.orchestratorExplorer datadog.orchestratorExplorer.enabled: spec.features.orchestratorExplorer.enabled datadog.originDetectionUnified.enabled: spec.global.originDetectionUnified.enabled datadog.osReleasePath: "" +datadog.otelCollector.config: "" datadog.otelCollector.enabled: "" datadog.otelCollector.ports: "" datadog.otlp.logs.enabled: "" @@ -500,4 +502,3 @@ providers.gke.cos: "" registry: spec.global.registry remoteConfiguration.enabled: spec.features.remoteConfiguration.enabled targetSystem: "" -testKey.enabled: ""