fix: adjust usage of PrometheusSpec type

Problem: Embedded structs can as of yet not be directly referenced in struct
literals.

Solution: Explicitly use the embedded structs.

Issues: golang/go#9859,
prometheus-operator/prometheus-operator#4539

Signed-off-by: Jan Fajerski <[email protected]>

Author: jan--f

pkg/controllers/monitoring-stack/components.go

@@ -123,23 +123,53 @@ func newPrometheus(
 		},
 
 		Spec: monv1.PrometheusSpec{
-			Replicas: config.Replicas,
+			CommonPrometheusFields: monv1.CommonPrometheusFields{
+				Replicas: config.Replicas,
 
-			PodMetadata: &monv1.EmbeddedObjectMetadata{
-				Labels: podLabels("prometheus", ms.Name),
-			},
-
-			// Prometheus does not use an Enum for LogLevel, so need to convert to string
-			LogLevel: string(ms.Spec.LogLevel),
-
-			Retention: ms.Spec.Retention,
-			Resources: ms.Spec.Resources,
+				PodMetadata: &monv1.EmbeddedObjectMetadata{
+					Labels: podLabels("prometheus", ms.Name),
+				},
 
-			ServiceAccountName: rbacResourceName,
+				// Prometheus does not use an Enum for LogLevel, so need to convert to string
+				LogLevel: string(ms.Spec.LogLevel),
+
+				Resources: ms.Spec.Resources,
+
+				ServiceAccountName: rbacResourceName,
+
+				ServiceMonitorSelector:          prometheusSelector,
+				ServiceMonitorNamespaceSelector: nil,
+				PodMonitorSelector:              prometheusSelector,
+				PodMonitorNamespaceSelector:     nil,
+				Affinity: &corev1.Affinity{
+					PodAntiAffinity: &corev1.PodAntiAffinity{
+						RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
+							{
+								TopologyKey: "kubernetes.io/hostname",
+								LabelSelector: &metav1.LabelSelector{
+									MatchLabels: podLabels("prometheus", ms.Name),
+								},
+							},
+						},
+					},
+				},
 
-			ServiceMonitorSelector: prometheusSelector,
-			PodMonitorSelector:     prometheusSelector,
-			RuleSelector:           prometheusSelector,
+				// Prometheus should be configured for self-scraping through a static job.
+				// It avoids the need to synthesize a ServiceMonitor with labels that will match
+				// what the user defines in the monitoring stacks's resourceSelector field.
+				AdditionalScrapeConfigs: &corev1.SecretKeySelector{
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: additionalScrapeConfigsSecretName,
+					},
+					Key: AdditionalScrapeConfigsSelfScrapeKey,
+				},
+				Storage:        storageForPVC(config.PersistentVolumeClaim),
+				RemoteWrite:    config.RemoteWrite,
+				ExternalLabels: config.ExternalLabels,
+			},
+			Retention:             ms.Spec.Retention,
+			RuleSelector:          prometheusSelector,
+			RuleNamespaceSelector: nil,
 
 			Alerting: &monv1.AlertingSpec{
 				Alertmanagers: []monv1.AlertmanagerEndpoints{
@@ -152,35 +182,10 @@ func newPrometheus(
 					},
 				},
 			},
-			Affinity: &corev1.Affinity{
-				PodAntiAffinity: &corev1.PodAntiAffinity{
-					RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
-						{
-							TopologyKey: "kubernetes.io/hostname",
-							LabelSelector: &metav1.LabelSelector{
-								MatchLabels: podLabels("prometheus", ms.Name),
-							},
-						},
-					},
-				},
-			},
-
-			// Prometheus should be configured for self-scraping through a static job.
-			// It avoids the need to synthesize a ServiceMonitor with labels that will match
-			// what the user defines in the monitoring stacks's resourceSelector field.
-			AdditionalScrapeConfigs: &corev1.SecretKeySelector{
-				LocalObjectReference: corev1.LocalObjectReference{
-					Name: additionalScrapeConfigsSecretName,
-				},
-				Key: AdditionalScrapeConfigsSelfScrapeKey,
-			},
 			Thanos: &monv1.ThanosSpec{
 				BaseImage: stringPtr("quay.io/thanos/thanos"),
 				Version:   stringPtr("v0.24.0"),
 			},
-			Storage:        storageForPVC(config.PersistentVolumeClaim),
-			RemoteWrite:    config.RemoteWrite,
-			ExternalLabels: config.ExternalLabels,
 		},
 	}
 

test/e2e/monitoring_stack_controller_test.go

@@ -172,9 +172,11 @@ func reconcileStack(t *testing.T) {
 	f.GetResourceWithRetry(t, ms.Name, ms.Namespace, &generated)
 
 	expected := monv1.PrometheusSpec{
-		LogLevel:               string(ms.Spec.LogLevel),
-		Retention:              ms.Spec.Retention,
-		ServiceMonitorSelector: ms.Spec.ResourceSelector.DeepCopy(),
+		Retention: ms.Spec.Retention,
+		CommonPrometheusFields: monv1.CommonPrometheusFields{
+			LogLevel:               string(ms.Spec.LogLevel),
+			ServiceMonitorSelector: ms.Spec.ResourceSelector.DeepCopy(),
+		},
 	}
 
 	assert.DeepEqual(t, expected.ServiceMonitorSelector, generated.Spec.ServiceMonitorSelector)