Use same instance label value for network policies (#1509)

Co-authored-by: Sarah Wang <[email protected]>
DataDog · Nov 22, 2024 · 9d37612 · 9d37612
1 parent 715c6f6
commit 9d37612
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/internal/controller/datadogagent/component/objects/network.go b/internal/controller/datadogagent/component/objects/network.go
@@ -132,21 +132,17 @@ func BuildKubernetesNetworkPolicy(dda metav1.Object, componentName v2alpha1.Comp
 
 // GetNetworkPolicyMetadata generates a label selector based on component
 func GetNetworkPolicyMetadata(dda metav1.Object, componentName v2alpha1.ComponentName) (policyName string, podSelector metav1.LabelSelector) {
-	var suffix string
 	switch componentName {
 	case v2alpha1.NodeAgentComponentName:
 		policyName = componentagent.GetAgentName(dda)
-		suffix = v2alpha1.DefaultAgentResourceSuffix
 	case v2alpha1.ClusterAgentComponentName:
 		policyName = componentdca.GetClusterAgentName(dda)
-		suffix = v2alpha1.DefaultClusterAgentResourceSuffix
 	case v2alpha1.ClusterChecksRunnerComponentName:
 		policyName = componentccr.GetClusterChecksRunnerName(dda)
-		suffix = v2alpha1.DefaultClusterChecksRunnerResourceSuffix
 	}
 	podSelector = metav1.LabelSelector{
 		MatchLabels: map[string]string{
-			kubernetes.AppKubernetesInstanceLabelKey: suffix,
+			kubernetes.AppKubernetesInstanceLabelKey: policyName,
 			kubernetes.AppKubernetesPartOfLabelKey:   object.NewPartOfLabelValue(dda).String(),
 		},
 	}
@@ -555,7 +551,7 @@ func egressCCRToDCA(podSelector metav1.LabelSelector, dda metav1.Object) cilium.
 				ToEndpoints: []metav1.LabelSelector{
 					{
 						MatchLabels: map[string]string{
-							kubernetes.AppKubernetesInstanceLabelKey: v2alpha1.DefaultClusterAgentResourceSuffix,
+							kubernetes.AppKubernetesInstanceLabelKey: componentdca.GetClusterAgentName(dda),
 							kubernetes.AppKubernetesPartOfLabelKey:   fmt.Sprintf("%s-%s", dda.GetNamespace(), dda.GetName()),
 						},
 					},