Pod Node Affinity

inv tidy

comp/otelcol/ddflareextension/impl/go.mod

@@ -182,7 +182,7 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
 	github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
-	github.com/DataDog/agent-payload/v5 v5.0.138 // indirect
+	github.com/DataDog/agent-payload/v5 v5.0.139-0.20241227121136-afacfe086aee // indirect
 	github.com/DataDog/datadog-agent/comp/core/config v0.59.0 // indirect
 	github.com/DataDog/datadog-agent/comp/core/flare/builder v0.59.0 // indirect
 	github.com/DataDog/datadog-agent/comp/core/flare/types v0.59.0 // indirect

comp/otelcol/logsagentpipeline/go.mod

@@ -63,7 +63,7 @@ replace (
 require github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.3
 
 require (
-	github.com/DataDog/agent-payload/v5 v5.0.138 // indirect
+	github.com/DataDog/agent-payload/v5 v5.0.139-0.20241227121136-afacfe086aee // indirect
 	github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.3 // indirect
 	github.com/DataDog/datadog-agent/comp/core/secrets v0.59.0 // indirect
 	github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.3 // indirect

comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod

@@ -89,7 +89,7 @@ require (
 )
 
 require (
-	github.com/DataDog/agent-payload/v5 v5.0.138 // indirect
+	github.com/DataDog/agent-payload/v5 v5.0.139-0.20241227121136-afacfe086aee // indirect
 	github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.3 // indirect
 	github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.3 // indirect
 	github.com/DataDog/datadog-agent/comp/core/secrets v0.59.0 // indirect

comp/otelcol/otlp/components/exporter/datadogexporter/go.mod

@@ -131,7 +131,7 @@ require (
 )
 
 require (
-	github.com/DataDog/agent-payload/v5 v5.0.138 // indirect
+	github.com/DataDog/agent-payload/v5 v5.0.139-0.20241227121136-afacfe086aee // indirect
 	github.com/DataDog/datadog-agent/comp/core/config v0.57.1 // indirect
 	github.com/DataDog/datadog-agent/comp/core/flare/builder v0.57.1 // indirect
 	github.com/DataDog/datadog-agent/comp/core/flare/types v0.57.1 // indirect

comp/otelcol/otlp/components/exporter/serializerexporter/go.mod

@@ -90,7 +90,7 @@ require (
 )
 
 require (
-	github.com/DataDog/agent-payload/v5 v5.0.138 // indirect
+	github.com/DataDog/agent-payload/v5 v5.0.139-0.20241227121136-afacfe086aee // indirect
 	github.com/DataDog/datadog-agent/comp/core/config v0.57.1 // indirect
 	github.com/DataDog/datadog-agent/comp/core/flare/builder v0.57.1 // indirect
 	github.com/DataDog/datadog-agent/comp/core/flare/types v0.57.1 // indirect

pkg/collector/corechecks/cluster/orchestrator/transformers/k8s/pod.go

@@ -74,9 +74,72 @@ func ExtractPod(p *corev1.Pod) *model.Pod {
 		}
 	}
 
+	if p.Spec.Affinity != nil && p.Spec.Affinity.NodeAffinity != nil {
+		podModel.NodeAffinity = &model.NodeAffinity{
+			RequiredDuringSchedulingIgnoredDuringExecution:  convertNodeSelector(p.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution),
+			PreferredDuringSchedulingIgnoredDuringExecution: convertPreferredSchedulingTerm(p.Spec.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution),
+		}
+	}
+
 	return &podModel
 }
 
+func convertNodeSelector(ns *corev1.NodeSelector) *model.NodeSelector {
+	if ns == nil {
+		return nil
+	}
+	return &model.NodeSelector{
+		NodeSelectorTerms: convertNodeSelectorTerms(ns.NodeSelectorTerms),
+	}
+}
+
+func convertPreferredSchedulingTerm(terms []corev1.PreferredSchedulingTerm) []*model.PreferredSchedulingTerm {
+	if len(terms) == 0 {
+		return nil
+	}
+	var preferredTerms []*model.PreferredSchedulingTerm
+	for _, term := range terms {
+		preferredTerms = append(preferredTerms, &model.PreferredSchedulingTerm{
+			Preference: convertNodeSelectorTerm(term.Preference),
+			Weight:     term.Weight,
+		})
+	}
+	return preferredTerms
+}
+
+func convertNodeSelectorTerms(terms []corev1.NodeSelectorTerm) []*model.NodeSelectorTerm {
+	if len(terms) == 0 {
+		return nil
+	}
+	var nodeSelectorTerms []*model.NodeSelectorTerm
+	for _, term := range terms {
+		nodeSelectorTerms = append(nodeSelectorTerms, convertNodeSelectorTerm(term))
+	}
+	return nodeSelectorTerms
+}
+
+func convertNodeSelectorTerm(term corev1.NodeSelectorTerm) *model.NodeSelectorTerm {
+	return &model.NodeSelectorTerm{
+		MatchExpressions: convertNodeSelectorRequirements(term.MatchExpressions),
+		MatchFields:      convertNodeSelectorRequirements(term.MatchFields),
+	}
+}
+
+func convertNodeSelectorRequirements(requirements []corev1.NodeSelectorRequirement) []*model.LabelSelectorRequirement {
+	if len(requirements) == 0 {
+		return nil
+	}
+	var nodeSelectorRequirements []*model.LabelSelectorRequirement
+	for _, req := range requirements {
+		nodeSelectorRequirements = append(nodeSelectorRequirements, &model.LabelSelectorRequirement{
+			Key:      req.Key,
+			Operator: string(req.Operator),
+			Values:   req.Values,
+		})
+	}
+	return nodeSelectorRequirements
+}
+
 // ExtractPodTemplateResourceRequirements extracts resource requirements of containers and initContainers into model.ResourceRequirements
 func ExtractPodTemplateResourceRequirements(template corev1.PodTemplateSpec) []*model.ResourceRequirements {
 	return extractPodResourceRequirements(template.Spec.Containers, template.Spec.InitContainers)