Merge pull request #8686 from dustman9000/fix/metrics-forwarder-workload-annotation

OCPBUGS-87217: fix: add CPU partitioning workload annotation to control-plane-metrics-forwarder

Author: openshift-merge-bot[bot]

control-plane-operator/hostedclusterconfigoperator/controllers/resources/monitoring/metricsforwarder.go

@@ -32,7 +32,8 @@ func ReconcileMetricsForwarderDeployment(deployment *appsv1.Deployment, haproxyI
 			ObjectMeta: metav1.ObjectMeta{
 				Labels: labels,
 				Annotations: map[string]string{
-					"metrics-forwarder-config-checksum": configHash,
+					"metrics-forwarder-config-checksum":       configHash,
+					"target.workload.openshift.io/management": `{"effect": "PreferredDuringScheduling"}`,
 				},
 			},
 			Spec: corev1.PodSpec{

control-plane-operator/hostedclusterconfigoperator/controllers/resources/monitoring/metricsforwarder_test.go

@@ -40,6 +40,7 @@ func TestReconcileMetricsForwarderDeployment(t *testing.T) {
 			err := ReconcileMetricsForwarderDeployment(deployment, tt.image, tt.configHash)
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(deployment.Spec.Template.Annotations).To(HaveKeyWithValue("metrics-forwarder-config-checksum", tt.configHash))
+			g.Expect(deployment.Spec.Template.Annotations).To(HaveKeyWithValue("target.workload.openshift.io/management", `{"effect": "PreferredDuringScheduling"}`))
 			g.Expect(deployment.Spec.Template.Spec.Containers).To(HaveLen(1))
 			g.Expect(deployment.Spec.Template.Spec.Containers[0].Image).To(Equal(tt.image))
 		})