Convert podLabelsAsTags and podAnnotationsAsTags (#716)

DataDog · Mar 1, 2023 · 3170357 · 3170357
1 parent c9c10cb
commit 3170357
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/apis/datadoghq/v1alpha1/datadogagent_conversion_agent.go b/apis/datadoghq/v1alpha1/datadogagent_conversion_agent.go
@@ -52,6 +52,14 @@ func convertDatadogAgentSpec(src *DatadogAgentSpecAgentSpec, dst *v2alpha1.Datad
 			getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName).ExtraChecksd = ConvertConfigDirSpec(src.Config.Checksd)
 		}
 
+		if src.Config.PodLabelsAsTags != nil {
+			getV2GlobalConfig(dst).PodLabelsAsTags = src.Config.PodLabelsAsTags
+		}
+
+		if src.Config.PodAnnotationsAsTags != nil {
+			getV2GlobalConfig(dst).PodAnnotationsAsTags = src.Config.PodAnnotationsAsTags
+		}
+
 		if src.Config.Tags != nil {
 			getV2GlobalConfig(dst).Tags = append(getV2GlobalConfig(dst).Tags, src.Config.Tags...)
 		}

diff --git a/apis/datadoghq/v1alpha1/testdata/all.expected.yaml b/apis/datadoghq/v1alpha1/testdata/all.expected.yaml
@@ -80,6 +80,10 @@ spec:
       appSecret:
         keyName: app-key
         secretName: datadog-secret
+    podLabelsAsTags:
+      custom-tag1: custom-tag1
+    podAnnotationsAsTags:
+      custom-tag2: custom-tag2
     criSocketPath: /var/run/crio/crio.sock
     dockerSocketPath: /var/docker.sock
     endpoint: