Merge pull request #2073 from marioferh/topology_spread_constrains_admission_webhook

OCPBUGS-19356: Topology spread constraints admission webhook

Author: openshift-merge-robot

Documentation/api.md

@@ -448,6 +448,7 @@ The `PrometheusOperatorAdmissionWebhookConfig` resource defines settings for the
 | Property | Type | Description |
 | -------- | ---- | ----------- |
 | resources | *[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core) | Defines resource requests and limits for the prometheus-operator-admission-webhook container. |
+| topologySpreadConstraints | []v1.TopologySpreadConstraint | Defines a pod's topology spread constraints. |
 
 [Back to TOC](#table-of-contents)
 

Documentation/openshiftdocs/modules/prometheusoperatoradmissionwebhookconfig.adoc

@@ -20,6 +20,8 @@ Appears in: link:clustermonitoringconfiguration.adoc[ClusterMonitoringConfigurat
 | Property | Type | Description 
 |resources|*v1.ResourceRequirements|Defines resource requests and limits for the prometheus-operator-admission-webhook container.
 
+|topologySpreadConstraints|[]v1.TopologySpreadConstraint|Defines a pod's topology spread constraints.
+
 |===
 
 link:../index.adoc[Back to TOC]

pkg/manifests/manifests.go

@@ -2170,6 +2170,11 @@ func (f *Factory) PrometheusOperatorAdmissionWebhookDeployment() (*appsv1.Deploy
 		d.Spec.Template.Spec.Tolerations = f.config.ClusterMonitoringConfiguration.PrometheusOperatorConfig.Tolerations
 	}
 
+	if len(f.config.ClusterMonitoringConfiguration.PrometheusOperatorAdmissionWebhookConfig.TopologySpreadConstraints) > 0 {
+		d.Spec.Template.Spec.TopologySpreadConstraints =
+			f.config.ClusterMonitoringConfiguration.PrometheusOperatorAdmissionWebhookConfig.TopologySpreadConstraints
+	}
+
 	for i, container := range d.Spec.Template.Spec.Containers {
 		switch container.Name {
 		case "prometheus-operator-admission-webhook":

pkg/manifests/manifests_test.go

@@ -899,6 +899,13 @@ prometheusOperatorAdmissionWebhook:
     limits:
       cpu: 200m
       memory: 200Mi
+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: type
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          foo: bar
 `, false)
 	if err != nil {
 		t.Fatal(err)
@@ -910,6 +917,14 @@ prometheusOperatorAdmissionWebhook:
 		t.Fatal(err)
 	}
 
+	if d.Spec.Template.Spec.TopologySpreadConstraints[0].MaxSkew != 1 {
+		t.Fatal("prometheus-operator-admission-webhook topology spread constraints MaxSkew not configured correctly")
+	}
+
+	if d.Spec.Template.Spec.TopologySpreadConstraints[0].WhenUnsatisfiable != "DoNotSchedule" {
+		t.Fatal("prometheus-operator-admission-webhook topology spread constraints WhenUnsatisfiable not configured correctly")
+	}
+
 	for _, container := range d.Spec.Template.Spec.Containers {
 		switch container.Name {
 		case "prometheus-operator-admission-webhook":

pkg/manifests/types.go

@@ -681,6 +681,8 @@ type ThanosRulerConfig struct {
 type PrometheusOperatorAdmissionWebhookConfig struct {
 	// Defines resource requests and limits for the prometheus-operator-admission-webhook container.
 	Resources *v1.ResourceRequirements `json:"resources,omitempty"`
+	// Defines a pod's topology spread constraints.
+	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 }
 
 // The `MonitoringPluginConfig` resource defines settings for the