From 3170357acb87aac062d6379fdceafe981637ca9d Mon Sep 17 00:00:00 2001
From: khewonc <39867936+khewonc@users.noreply.github.com>
Date: Tue, 21 Feb 2023 16:51:21 -0500
Subject: [PATCH] Convert podLabelsAsTags and podAnnotationsAsTags (#716)

---
 apis/datadoghq/v1alpha1/datadogagent_conversion_agent.go | 8 ++++++++
 apis/datadoghq/v1alpha1/testdata/all.expected.yaml       | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/apis/datadoghq/v1alpha1/datadogagent_conversion_agent.go b/apis/datadoghq/v1alpha1/datadogagent_conversion_agent.go
index 60a425fe5..5132f7030 100644
--- 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
index a7a6be2b5..7741cafdd 100644
--- 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: