fixing type

Author: rashmichandrashekar

cmd/otel-allocator/watcher/promOperator.go

@@ -73,19 +73,11 @@ func NewPrometheusCRWatcher(ctx context.Context, logger logr.Logger, cfg allocat
 	prom := &monitoringv1.Prometheus{
 		Spec: monitoringv1.PrometheusSpec{
 			CommonPrometheusFields: monitoringv1.CommonPrometheusFields{
-				ScrapeInterval: monitoringv1.Duration(cfg.PrometheusCR.ScrapeInterval.String()),
-				ServiceMonitorSelector: &metav1.LabelSelector{
-					MatchLabels: cfg.ServiceMonitorSelector,
-				},
-				PodMonitorSelector: &metav1.LabelSelector{
-					MatchLabels: cfg.PodMonitorSelector,
-				},
-				ServiceMonitorNamespaceSelector: &metav1.LabelSelector{
-					MatchLabels: cfg.ServiceMonitorNamespaceSelector,
-				},
-				PodMonitorNamespaceSelector: &metav1.LabelSelector{
-					MatchLabels: cfg.PodMonitorNamespaceSelector,
-				},
+				ScrapeInterval:                  monitoringv1.Duration(cfg.PrometheusCR.ScrapeInterval.String()),
+				ServiceMonitorSelector:          cfg.ServiceMonitorSelector,
+				PodMonitorSelector:              cfg.PodMonitorSelector,
+				ServiceMonitorNamespaceSelector: cfg.ServiceMonitorNamespaceSelector,
+				PodMonitorNamespaceSelector:     cfg.PodMonitorNamespaceSelector,
 			},
 		},
 	}
@@ -111,23 +103,19 @@ func NewPrometheusCRWatcher(ctx context.Context, logger logr.Logger, cfg allocat
 	}
 
 	return &PrometheusCRWatcher{
-		logger:               logger,
-		kubeMonitoringClient: mClient,
-		k8sClient:            clientset,
-		informers:            monitoringInformers,
-		nsInformer:           nsMonInf,
-		stopChannel:          make(chan struct{}),
-		eventInterval:        minEventInterval,
-		configGenerator:      generator,
-		kubeConfigPath:       cfg.KubeConfigFilePath,
-		podMonitorNamespaceSelector: &metav1.LabelSelector{
-			MatchLabels: cfg.PodMonitorNamespaceSelector,
-		},
-		serviceMonitorNamespaceSelector: &metav1.LabelSelector{
-			MatchLabels: cfg.ServiceMonitorNamespaceSelector,
-		},
-		resourceSelector: resourceSelector,
-		store:            store,
+		logger:                          logger,
+		kubeMonitoringClient:            mClient,
+		k8sClient:                       clientset,
+		informers:                       monitoringInformers,
+		nsInformer:                      nsMonInf,
+		stopChannel:                     make(chan struct{}),
+		eventInterval:                   minEventInterval,
+		configGenerator:                 generator,
+		kubeConfigPath:                  cfg.KubeConfigFilePath,
+		podMonitorNamespaceSelector:     cfg.PodMonitorNamespaceSelector,
+		serviceMonitorNamespaceSelector: cfg.ServiceMonitorNamespaceSelector,
+		resourceSelector:                resourceSelector,
+		store:                           store,
 	}, nil
 }
 

cmd/otel-allocator/watcher/promOperator_test.go

@@ -506,8 +506,10 @@ func TestLoadConfig(t *testing.T) {
 				},
 			},
 			cfg: allocatorconfig.Config{
-				ServiceMonitorSelector: map[string]string{
-					"testsvc": "testsvc",
+				ServiceMonitorSelector: &metav1.LabelSelector{
+					MatchLabels: map[string]string{
+						"testsvc": "testsvc",
+					},
 				},
 			},
 			want: &promconfig.Config{
@@ -571,8 +573,10 @@ func TestLoadConfig(t *testing.T) {
 				},
 			},
 			cfg: allocatorconfig.Config{
-				PodMonitorSelector: map[string]string{
-					"testpod": "testpod",
+				PodMonitorSelector: &metav1.LabelSelector{
+					MatchLabels: map[string]string{
+						"testpod": "testpod",
+					},
 				},
 			},
 			want: &promconfig.Config{
@@ -633,8 +637,10 @@ func TestLoadConfig(t *testing.T) {
 				},
 			},
 			cfg: allocatorconfig.Config{
-				ServiceMonitorNamespaceSelector: map[string]string{
-					"label1": "label1",
+				ServiceMonitorNamespaceSelector: &metav1.LabelSelector{
+					MatchLabels: map[string]string{
+						"label1": "label1",
+					},
 				},
 			},
 			want: &promconfig.Config{
@@ -695,8 +701,10 @@ func TestLoadConfig(t *testing.T) {
 				},
 			},
 			cfg: allocatorconfig.Config{
-				PodMonitorNamespaceSelector: map[string]string{
-					"label1": "label1",
+				PodMonitorNamespaceSelector: &metav1.LabelSelector{
+					MatchLabels: map[string]string{
+						"label1": "label1",
+					},
 				},
 			},
 			want: &promconfig.Config{
@@ -790,8 +798,10 @@ func TestNamespaceLabelUpdate(t *testing.T) {
 	}
 
 	cfg := allocatorconfig.Config{
-		PodMonitorNamespaceSelector: map[string]string{
-			"label1": "label1",
+		PodMonitorNamespaceSelector: &metav1.LabelSelector{
+			MatchLabels: map[string]string{
+				"label1": "label1",
+			},
 		},
 	}
 
@@ -1005,19 +1015,11 @@ func getTestPrometheusCRWatcher(t *testing.T, svcMonitors []*monitoringv1.Servic
 	prom := &monitoringv1.Prometheus{
 		Spec: monitoringv1.PrometheusSpec{
 			CommonPrometheusFields: monitoringv1.CommonPrometheusFields{
-				ScrapeInterval: monitoringv1.Duration("30s"),
-				ServiceMonitorSelector: &metav1.LabelSelector{
-					MatchLabels: cfg.ServiceMonitorSelector,
-				},
-				PodMonitorSelector: &metav1.LabelSelector{
-					MatchLabels: cfg.PodMonitorSelector,
-				},
-				ServiceMonitorNamespaceSelector: &metav1.LabelSelector{
-					MatchLabels: cfg.ServiceMonitorNamespaceSelector,
-				},
-				PodMonitorNamespaceSelector: &metav1.LabelSelector{
-					MatchLabels: cfg.PodMonitorNamespaceSelector,
-				},
+				ScrapeInterval:                  monitoringv1.Duration("30s"),
+				ServiceMonitorSelector:          cfg.ServiceMonitorSelector,
+				PodMonitorSelector:              cfg.PodMonitorSelector,
+				ServiceMonitorNamespaceSelector: cfg.ServiceMonitorNamespaceSelector,
+				PodMonitorNamespaceSelector:     cfg.PodMonitorNamespaceSelector,
 			},
 		},
 	}
@@ -1048,20 +1050,16 @@ func getTestPrometheusCRWatcher(t *testing.T, svcMonitors []*monitoringv1.Servic
 	resourceSelector := prometheus.NewResourceSelector(promOperatorLogger, prom, store, nsMonInf, operatorMetrics, eventRecorder)
 
 	return &PrometheusCRWatcher{
-		kubeMonitoringClient: mClient,
-		k8sClient:            k8sClient,
-		informers:            informers,
-		nsInformer:           nsMonInf,
-		stopChannel:          make(chan struct{}),
-		configGenerator:      generator,
-		podMonitorNamespaceSelector: &metav1.LabelSelector{
-			MatchLabels: cfg.PodMonitorNamespaceSelector,
-		},
-		serviceMonitorNamespaceSelector: &metav1.LabelSelector{
-			MatchLabels: cfg.ServiceMonitorNamespaceSelector,
-		},
-		resourceSelector: resourceSelector,
-		store:            store,
+		kubeMonitoringClient:            mClient,
+		k8sClient:                       k8sClient,
+		informers:                       informers,
+		nsInformer:                      nsMonInf,
+		stopChannel:                     make(chan struct{}),
+		configGenerator:                 generator,
+		podMonitorNamespaceSelector:     cfg.PodMonitorNamespaceSelector,
+		serviceMonitorNamespaceSelector: cfg.ServiceMonitorNamespaceSelector,
+		resourceSelector:                resourceSelector,
+		store:                           store,
 	}, source
 
 }