Skip to content

Commit

Permalink
Merge pull request #279 from vyzigold/update_sample_crs
Browse files Browse the repository at this point in the history
Update sample CRs and kuttl CRs
  • Loading branch information
openshift-merge-bot[bot] authored Jan 16, 2024
2 parents a084277 + 6d79abe commit 688452f
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions config/samples/telemetry_v1beta1_autoscaling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ metadata:
app.kubernetes.io/created-by: telemetry-operator
name: autoscaling
spec:
prometheus:
deployPrometheus: false
aodh:
secret: osp-secret
passwordSelectors:
Expand Down
4 changes: 0 additions & 4 deletions config/samples/telemetry_v1beta1_telemetry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/kuttl/suites/default/tests/01-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ spec:
metricStorage:
enabled: true
monitoringStack:
type: prometheus
autoscaling:
enabled: true
aodh:
Expand Down
1 change: 0 additions & 1 deletion tests/kuttl/suites/metricstorage/tests/01-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
name: telemetry-kuttl
spec:
monitoringStack:
type: prometheus
alertingEnabled: true
scrapeInterval: 30s
storage:
Expand Down

0 comments on commit 688452f

Please sign in to comment.