Merge pull request #2072 from marioferh/topology_spread_constrains_UWM_prometheus-operator

OCPBUGS-17682: add topologySpreadConstraints to UWM prometheus operator

Author: openshift-merge-robot

pkg/manifests/manifests.go

@@ -2274,6 +2274,10 @@ func (f *Factory) PrometheusOperatorUserWorkloadDeployment() (*appsv1.Deployment
 		d.Spec.Template.Spec.Tolerations = f.config.UserWorkloadConfiguration.PrometheusOperator.Tolerations
 	}
 
+	if len(f.config.UserWorkloadConfiguration.PrometheusOperator.TopologySpreadConstraints) > 0 {
+		d.Spec.Template.Spec.TopologySpreadConstraints = f.config.UserWorkloadConfiguration.PrometheusOperator.TopologySpreadConstraints
+	}
+
 	for i, container := range d.Spec.Template.Spec.Containers {
 		switch container.Name {
 		case "kube-rbac-proxy":

pkg/manifests/manifests_test.go

@@ -4386,9 +4386,18 @@ func TestPodDisruptionBudget(t *testing.T) {
 }
 
 func TestPrometheusOperatorUserWorkloadConfiguration(t *testing.T) {
-	c, err := NewConfigFromString(`
-enableUserWorkload: true
-`, false)
+	c := NewDefaultConfig()
+	uwc, err := NewUserConfigFromString(`prometheusOperator:
+  topologySpreadConstraints:
+  - maxSkew: 1
+    topologyKey: type
+    whenUnsatisfiable: DoNotSchedule
+    labelSelector:
+      matchLabels:
+        foo: bar
+  `)
+
+	c.UserWorkloadConfiguration = uwc
 
 	c.SetImages(map[string]string{
 		"prometheus-operator":        "docker.io/openshift/origin-prometheus-operator:latest",
@@ -4463,6 +4472,14 @@ enableUserWorkload: true
 	if !reflect.DeepEqual(d, d2) {
 		t.Fatal("expected PrometheusOperatorUserWorkloadDeployment to be an idempotent function")
 	}
+
+	if d.Spec.Template.Spec.TopologySpreadConstraints[0].MaxSkew != 1 {
+		t.Fatal("prometheus-operator UWM spread contraints MaxSkew not configured correctly")
+	}
+
+	if d.Spec.Template.Spec.TopologySpreadConstraints[0].WhenUnsatisfiable != "DoNotSchedule" {
+		t.Fatal("prometheus-operator UWM spread contraints WhenUnsatisfiable not configured correctly")
+	}
 }
 
 func TestPrometheusOperatorNodeSelector(t *testing.T) {