From 35476e16338337deae706977f497b2decd74e00b Mon Sep 17 00:00:00 2001 From: Leif Madsen Date: Fri, 19 Jan 2024 14:48:15 -0500 Subject: [PATCH] Remove hard-coded Prometheus version in template (#565) Remove the hard-coded Prometheus version in the Prometheus template when using observabilityStrategy use_redhat, which uses Cluster Observability Operator to manage the Prometheus instance requests. Previously this value was hard-coded to prevent a potential rollback when moving from Community Prometheus Operator to Cluster Observability Operator. Resolves: JIRA#OSPRH-2140 --- roles/servicetelemetry/templates/manifest_prometheus.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/servicetelemetry/templates/manifest_prometheus.j2 b/roles/servicetelemetry/templates/manifest_prometheus.j2 index e9eb63786..66f2d5a8d 100644 --- a/roles/servicetelemetry/templates/manifest_prometheus.j2 +++ b/roles/servicetelemetry/templates/manifest_prometheus.j2 @@ -7,7 +7,11 @@ metadata: name: '{{ ansible_operator_meta.name }}' namespace: '{{ ansible_operator_meta.namespace }}' spec: +{% if observability_strategy != "use_community" %} + version: null +{% else %} version: v2.43.0 +{% endif %} replicas: {{ servicetelemetry_vars.backends.metrics.prometheus.deployment_size }} ruleSelector: {} securityContext: {}