Merge pull request #279 from vyzigold/update_sample_crs

openshift-merge-bot[bot] · web-flow · commit 688452fbf493 · 2024-01-16T15:30:46.000Z
Update sample CRs and kuttl CRs
diff --git a/config/samples/telemetry_v1beta1_autoscaling.yaml b/config/samples/telemetry_v1beta1_autoscaling.yaml
@@ -9,8 +9,6 @@ metadata:
     app.kubernetes.io/created-by: telemetry-operator
   name: autoscaling
 spec:
-  prometheus:
-    deployPrometheus: false
   aodh:
     secret: osp-secret
     passwordSelectors:
diff --git a/config/samples/telemetry_v1beta1_telemetry.yaml b/config/samples/telemetry_v1beta1_telemetry.yaml
@@ -6,19 +6,15 @@ spec:
   metricStorage:
     enabled: false
     monitoringStack:
-      type: prometheus
       alertingEnabled: true
       scrapeInterval: 30s
-      replicas: 1
       storage:
         strategy: persistent
         retention: 24h
         persistent:
           pvcStorageRequest: 20G
   autoscaling:
     enabled: false
-    prometheus:
-      deployPrometheus: true
     aodh:
       passwordSelectors:
       databaseUser: aodh
diff --git a/tests/kuttl/suites/default/tests/01-deploy.yaml b/tests/kuttl/suites/default/tests/01-deploy.yaml
@@ -6,7 +6,6 @@ spec:
   metricStorage:
     enabled: true
     monitoringStack:
-      type: prometheus
   autoscaling:
     enabled: true
     aodh:
diff --git a/tests/kuttl/suites/metricstorage/tests/01-deploy.yaml b/tests/kuttl/suites/metricstorage/tests/01-deploy.yaml
@@ -4,7 +4,6 @@ metadata:
   name: telemetry-kuttl
 spec:
   monitoringStack:
-    type: prometheus
     alertingEnabled: true
     scrapeInterval: 30s
     storage:
