[controllers/datadogagent] Add namespace in "part-of" label (#358)

DataDog · Aug 20, 2021 · f87e7c8 · f87e7c8
1 parent a3a4937
commit f87e7c8
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 79 deletions.
diff --git a/controllers/datadogagent/agent.go b/controllers/datadogagent/agent.go
@@ -379,7 +379,7 @@ func buildAgentNetworkPolicy(dda *datadoghqv1alpha1.DatadogAgent, name string) *
 			PodSelector: metav1.LabelSelector{
 				MatchLabels: map[string]string{
 					kubernetes.AppKubernetesInstanceLabelKey: datadoghqv1alpha1.DefaultAgentResourceSuffix,
-					kubernetes.AppKubernetesPartOfLabelKey:   dda.Name,
+					kubernetes.AppKubernetesPartOfLabelKey:   dda.Namespace + "-" + dda.Name,
 				},
 			},
 			Ingress: ingressRules,

diff --git a/controllers/datadogagent/agent_test.go b/controllers/datadogagent/agent_test.go
@@ -2079,7 +2079,7 @@ func Test_newExtendedDaemonSetFromInstance(t *testing.T) {
 						"app.kubernetes.io/instance":    "agent",
 						"app.kubernetes.io/managed-by":  "datadog-operator",
 						"app.kubernetes.io/name":        "datadog-agent-deployment",
-						"app.kubernetes.io/part-of":     "foo",
+						"app.kubernetes.io/part-of":     "bar-foo",
 						"app.kubernetes.io/version":     "",
 					},
 					Annotations: map[string]string{},
@@ -2095,7 +2095,7 @@ func Test_newExtendedDaemonSetFromInstance(t *testing.T) {
 								"app.kubernetes.io/instance":    "agent",
 								"app.kubernetes.io/managed-by":  "datadog-operator",
 								"app.kubernetes.io/name":        "datadog-agent-deployment",
-								"app.kubernetes.io/part-of":     "foo",
+								"app.kubernetes.io/part-of":     "bar-foo",
 								"app.kubernetes.io/version":     "",
 							},
 							Annotations: make(map[string]string),
@@ -2121,7 +2121,7 @@ func Test_newExtendedDaemonSetFromInstance(t *testing.T) {
 						"app.kubernetes.io/instance":    "agent",
 						"app.kubernetes.io/managed-by":  "datadog-operator",
 						"app.kubernetes.io/name":        "datadog-agent-deployment",
-						"app.kubernetes.io/part-of":     "foo",
+						"app.kubernetes.io/part-of":     "bar-foo",
 						"app.kubernetes.io/version":     "",
 					},
 					Annotations: map[string]string{},
@@ -2137,7 +2137,7 @@ func Test_newExtendedDaemonSetFromInstance(t *testing.T) {
 								"app.kubernetes.io/instance":    "agent",
 								"app.kubernetes.io/managed-by":  "datadog-operator",
 								"app.kubernetes.io/name":        "datadog-agent-deployment",
-								"app.kubernetes.io/part-of":     "foo",
+								"app.kubernetes.io/part-of":     "bar-foo",
 								"app.kubernetes.io/version":     "",
 								"tags.datadoghq.com/env":        "test",
 							},
@@ -2163,7 +2163,7 @@ func Test_newExtendedDaemonSetFromInstance(t *testing.T) {
 						"app.kubernetes.io/instance":    "agent",
 						"app.kubernetes.io/managed-by":  "datadog-operator",
 						"app.kubernetes.io/name":        "datadog-agent-deployment",
-						"app.kubernetes.io/part-of":     "foo",
+						"app.kubernetes.io/part-of":     "bar-foo",
 						"app.kubernetes.io/version":     "",
 					},
 					Annotations: map[string]string{},
@@ -2179,7 +2179,7 @@ func Test_newExtendedDaemonSetFromInstance(t *testing.T) {
 								"app.kubernetes.io/instance":    "agent",
 								"app.kubernetes.io/managed-by":  "datadog-operator",
 								"app.kubernetes.io/name":        "datadog-agent-deployment",
-								"app.kubernetes.io/part-of":     "foo",
+								"app.kubernetes.io/part-of":     "bar-foo",
 								"app.kubernetes.io/version":     "",
 							},
 							Annotations: make(map[string]string),
@@ -2204,7 +2204,7 @@ func Test_newExtendedDaemonSetFromInstance(t *testing.T) {
 						"app.kubernetes.io/instance":    "agent",
 						"app.kubernetes.io/managed-by":  "datadog-operator",
 						"app.kubernetes.io/name":        "datadog-agent-deployment",
-						"app.kubernetes.io/part-of":     "foo",
+						"app.kubernetes.io/part-of":     "bar-foo",
 						"app.kubernetes.io/version":     "",
 					},
 					Annotations: map[string]string{},
@@ -2220,7 +2220,7 @@ func Test_newExtendedDaemonSetFromInstance(t *testing.T) {
 								"app.kubernetes.io/instance":    "agent",
 								"app.kubernetes.io/managed-by":  "datadog-operator",
 								"app.kubernetes.io/name":        "datadog-agent-deployment",
-								"app.kubernetes.io/part-of":     "foo",
+								"app.kubernetes.io/part-of":     "bar-foo",
 								"app.kubernetes.io/version":     "",
 							},
 							Annotations: make(map[string]string),
@@ -2354,7 +2354,7 @@ func Test_newExtendedDaemonSetFromInstance_CustomConfigMaps(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -2370,7 +2370,7 @@ func Test_newExtendedDaemonSetFromInstance_CustomConfigMaps(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: make(map[string]string),
@@ -2597,7 +2597,7 @@ func Test_newExtendedDaemonSetFromInstance_CustomDatadogYaml(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -2613,7 +2613,7 @@ func Test_newExtendedDaemonSetFromInstance_CustomDatadogYaml(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: make(map[string]string),
@@ -2663,7 +2663,7 @@ func Test_ExtraParameters(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -2679,7 +2679,7 @@ func Test_ExtraParameters(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 							"pod-foo":                       "bar",
 						},
@@ -2741,7 +2741,7 @@ func Test_newExtendedDaemonSetFromInstance_CustomVolumes(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -2757,7 +2757,7 @@ func Test_newExtendedDaemonSetFromInstance_CustomVolumes(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: map[string]string{},
@@ -2798,7 +2798,7 @@ func Test_newExtendedDaemonSetFromInstance_DaemonSetNameAndSelector(t *testing.T
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -2819,7 +2819,7 @@ func Test_newExtendedDaemonSetFromInstance_DaemonSetNameAndSelector(t *testing.T
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 							"app":                           "datadog-monitoring",
 						},
@@ -2925,7 +2925,7 @@ func Test_newExtendedDaemonSetFromInstance_LogsEnabled(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -2941,7 +2941,7 @@ func Test_newExtendedDaemonSetFromInstance_LogsEnabled(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: make(map[string]string),
@@ -2983,7 +2983,7 @@ func Test_newExtendedDaemonSetFromInstance_clusterChecksConfig(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -2999,7 +2999,7 @@ func Test_newExtendedDaemonSetFromInstance_clusterChecksConfig(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: make(map[string]string),
@@ -3039,7 +3039,7 @@ func Test_newExtendedDaemonSetFromInstance_endpointsChecksConfig(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -3055,7 +3055,7 @@ func Test_newExtendedDaemonSetFromInstance_endpointsChecksConfig(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: make(map[string]string),
@@ -3081,7 +3081,7 @@ func extendedDaemonSetWithSystemProbe(podSpec corev1.PodSpec) *edsdatadoghqv1alp
 				"app.kubernetes.io/instance":    "agent",
 				"app.kubernetes.io/managed-by":  "datadog-operator",
 				"app.kubernetes.io/name":        "datadog-agent-deployment",
-				"app.kubernetes.io/part-of":     "foo",
+				"app.kubernetes.io/part-of":     "bar-foo",
 				"app.kubernetes.io/version":     "",
 			},
 			Annotations: map[string]string{},
@@ -3097,7 +3097,7 @@ func extendedDaemonSetWithSystemProbe(podSpec corev1.PodSpec) *edsdatadoghqv1alp
 						"app.kubernetes.io/instance":    "agent",
 						"app.kubernetes.io/managed-by":  "datadog-operator",
 						"app.kubernetes.io/name":        "datadog-agent-deployment",
-						"app.kubernetes.io/part-of":     "foo",
+						"app.kubernetes.io/part-of":     "bar-foo",
 						"app.kubernetes.io/version":     "",
 					},
 					Annotations: map[string]string{
@@ -3123,7 +3123,7 @@ func extendedDaemonSetDefault(podSpec corev1.PodSpec) *edsdatadoghqv1alpha1.Exte
 				"app.kubernetes.io/instance":    "agent",
 				"app.kubernetes.io/managed-by":  "datadog-operator",
 				"app.kubernetes.io/name":        "datadog-agent-deployment",
-				"app.kubernetes.io/part-of":     "foo",
+				"app.kubernetes.io/part-of":     "bar-foo",
 				"app.kubernetes.io/version":     "",
 			},
 			Annotations: map[string]string{},
@@ -3139,7 +3139,7 @@ func extendedDaemonSetDefault(podSpec corev1.PodSpec) *edsdatadoghqv1alpha1.Exte
 						"app.kubernetes.io/instance":    "agent",
 						"app.kubernetes.io/managed-by":  "datadog-operator",
 						"app.kubernetes.io/name":        "datadog-agent-deployment",
-						"app.kubernetes.io/part-of":     "foo",
+						"app.kubernetes.io/part-of":     "bar-foo",
 						"app.kubernetes.io/version":     "",
 					},
 					Annotations: map[string]string{},
@@ -3403,7 +3403,7 @@ func Test_newExtendedDaemonSetFromInstance_SecurityAgent_Compliance(t *testing.T
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -3419,7 +3419,7 @@ func Test_newExtendedDaemonSetFromInstance_SecurityAgent_Compliance(t *testing.T
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: map[string]string{},
@@ -3502,7 +3502,7 @@ func Test_newExtendedDaemonSetFromInstance_SecurityAgent_Runtime(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -3518,7 +3518,7 @@ func Test_newExtendedDaemonSetFromInstance_SecurityAgent_Runtime(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: map[string]string{
@@ -3568,7 +3568,7 @@ func Test_newExtendedDaemonSetFromInstance_KubeletConfiguration(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -3584,7 +3584,7 @@ func Test_newExtendedDaemonSetFromInstance_KubeletConfiguration(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: map[string]string{},
@@ -3629,7 +3629,7 @@ func Test_newExtendedDaemonSetFromInstance_ArgsCommandOverride(t *testing.T) {
 					"app.kubernetes.io/instance":    "agent",
 					"app.kubernetes.io/managed-by":  "datadog-operator",
 					"app.kubernetes.io/name":        "datadog-agent-deployment",
-					"app.kubernetes.io/part-of":     "foo",
+					"app.kubernetes.io/part-of":     "bar-foo",
 					"app.kubernetes.io/version":     "",
 				},
 				Annotations: map[string]string{},
@@ -3645,7 +3645,7 @@ func Test_newExtendedDaemonSetFromInstance_ArgsCommandOverride(t *testing.T) {
 							"app.kubernetes.io/instance":    "agent",
 							"app.kubernetes.io/managed-by":  "datadog-operator",
 							"app.kubernetes.io/name":        "datadog-agent-deployment",
-							"app.kubernetes.io/part-of":     "foo",
+							"app.kubernetes.io/part-of":     "bar-foo",
 							"app.kubernetes.io/version":     "",
 						},
 						Annotations: map[string]string{},

diff --git a/controllers/datadogagent/clusteragent.go b/controllers/datadogagent/clusteragent.go
@@ -1535,7 +1535,7 @@ func buildClusterAgentNetworkPolicy(dda *datadoghqv1alpha1.DatadogAgent, name st
 					PodSelector: &metav1.LabelSelector{
 						MatchLabels: map[string]string{
 							kubernetes.AppKubernetesInstanceLabelKey: datadoghqv1alpha1.DefaultAgentResourceSuffix,
-							kubernetes.AppKubernetesPartOfLabelKey:   dda.Name,
+							kubernetes.AppKubernetesPartOfLabelKey:   dda.Namespace + "-" + dda.Name,
 						},
 					},
 				},
@@ -1558,7 +1558,7 @@ func buildClusterAgentNetworkPolicy(dda *datadoghqv1alpha1.DatadogAgent, name st
 					PodSelector: &metav1.LabelSelector{
 						MatchLabels: map[string]string{
 							kubernetes.AppKubernetesInstanceLabelKey: datadoghqv1alpha1.DefaultClusterChecksRunnerResourceSuffix,
-							kubernetes.AppKubernetesPartOfLabelKey:   dda.Name,
+							kubernetes.AppKubernetesPartOfLabelKey:   dda.Namespace + "-" + dda.Name,
 						},
 					},
 				},
@@ -1589,7 +1589,7 @@ func buildClusterAgentNetworkPolicy(dda *datadoghqv1alpha1.DatadogAgent, name st
 			PodSelector: metav1.LabelSelector{
 				MatchLabels: map[string]string{
 					kubernetes.AppKubernetesInstanceLabelKey: datadoghqv1alpha1.DefaultClusterAgentResourceSuffix,
-					kubernetes.AppKubernetesPartOfLabelKey:   dda.Name,
+					kubernetes.AppKubernetesPartOfLabelKey:   dda.Namespace + "-" + dda.Name,
 				},
 			},
 			Ingress: ingressRules,