Fix tests and set metadata.namespace for Prometheus so assetstore can work

Signed-off-by: Charlie Le <[email protected]>

Author: CharlieTLe

cmd/otel-allocator/internal/watcher/promOperator.go

@@ -65,6 +65,10 @@ func NewPrometheusCRWatcher(ctx context.Context, logger logr.Logger, cfg allocat
 
 	// TODO: We should make these durations configurable
 	prom := &monitoringv1.Prometheus{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "example",
+			Namespace: "default",
+		},
 		Spec: monitoringv1.PrometheusSpec{
 			CommonPrometheusFields: monitoringv1.CommonPrometheusFields{
 				ScrapeInterval:                  monitoringv1.Duration(cfg.PrometheusCR.ScrapeInterval.String()),

tests/e2e-openshift/must-gather/assert-install-target-allocator.yaml

@@ -34,7 +34,6 @@ data:
                         - PrometheusProto
                         - OpenMetricsText1.0.0
                         - OpenMetricsText0.0.1
-                        - PrometheusText1.0.0
                         - PrometheusText0.0.4
             target_allocator:
                 collector_id: ${POD_NAME}
@@ -84,7 +83,6 @@ data:
             - PrometheusProto
             - OpenMetricsText1.0.0
             - OpenMetricsText0.0.1
-            - PrometheusText1.0.0
             - PrometheusText0.0.4
         scrape_configs:
           - job_name: otel-collector

tests/e2e-openshift/must-gather/install-target-allocator.yaml

@@ -48,7 +48,7 @@ spec:
         config:
           global:
             scrape_interval: 30s
-            scrape_protocols: ['PrometheusProto','OpenMetricsText1.0.0','OpenMetricsText0.0.1','PrometheusText1.0.0','PrometheusText0.0.4']
+            scrape_protocols: ['PrometheusProto','OpenMetricsText1.0.0','OpenMetricsText0.0.1','PrometheusText0.0.4']
           scrape_configs:
             - job_name: 'otel-collector'
               scrape_interval: 10s

tests/e2e-ta-collector-mtls/ta-disabled/00-assert.yaml

@@ -22,7 +22,6 @@ data:
               - PrometheusProto
               - OpenMetricsText1.0.0
               - OpenMetricsText0.0.1
-              - PrometheusText1.0.0
               - PrometheusText0.0.4
           scrape_configs:
             - job_name: otel-collector

tests/e2e-ta-collector-mtls/ta-disabled/00-install.yaml

@@ -14,7 +14,7 @@ spec:
         config:
           global:
             scrape_interval: 30s
-            scrape_protocols: ['PrometheusProto','OpenMetricsText1.0.0','OpenMetricsText0.0.1','PrometheusText1.0.0','PrometheusText0.0.4']
+            scrape_protocols: ['PrometheusProto','OpenMetricsText1.0.0','OpenMetricsText0.0.1','PrometheusText0.0.4']
           scrape_configs:
             - job_name: 'otel-collector'
               scrape_interval: 10s

tests/e2e/smoke-targetallocator/00-assert.yaml

@@ -38,7 +38,6 @@ data:
                         - PrometheusProto
                         - OpenMetricsText1.0.0
                         - OpenMetricsText0.0.1
-                        - PrometheusText1.0.0
                         - PrometheusText0.0.4
             target_allocator:
                 collector_id: ${POD_NAME}

tests/e2e/smoke-targetallocator/00-install.yaml

@@ -48,7 +48,7 @@ spec:
         config:
           global:
             scrape_interval: 30s
-            scrape_protocols: ['PrometheusProto','OpenMetricsText1.0.0','OpenMetricsText0.0.1','PrometheusText1.0.0','PrometheusText0.0.4']
+            scrape_protocols: ['PrometheusProto','OpenMetricsText1.0.0','OpenMetricsText0.0.1','PrometheusText0.0.4']
           scrape_configs:
             - job_name: 'otel-collector'
               scrape_interval: 10s

tests/e2e/smoke-targetallocator/chainsaw-test.yaml

@@ -43,7 +43,6 @@ spec:
                         - PrometheusProto
                         - OpenMetricsText1.0.0
                         - OpenMetricsText0.0.1
-                        - PrometheusText1.0.0
                         - PrometheusText0.0.4
                     scrape_configs:
                       - job_name: otel-collector