Merge branch 'master' into STF-1738/STO-414-416

infrawatch · Aug 28, 2024 · b667bc5 · b667bc5
2 parents 63e156a + 27cb54a
commit b667bc5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-ansible-operator:4.12
+FROM quay.io/openshift/origin-ansible-operator:4.14
 
 # temporarily switch to root user to adjust image layers
 USER 0

diff --git a/roles/servicetelemetry/tasks/component_alertmanager.yml b/roles/servicetelemetry/tasks/component_alertmanager.yml
@@ -46,6 +46,7 @@
     name: '{{ ansible_operator_meta.name }}'
     namespace: '{{ ansible_operator_meta.namespace }}'
   when:
+    - "'monitoring.rhobs' in api_groups"
     - observability_strategy not in ['use_redhat', 'use_hybrid']
 
 # TODO: expand the management of alertmanager receivers and move this functionality to a common location

diff --git a/roles/servicetelemetry/tasks/component_prometheus.yml b/roles/servicetelemetry/tasks/component_prometheus.yml
@@ -212,6 +212,7 @@
     name: '{{ ansible_operator_meta.name }}'
     namespace: '{{ ansible_operator_meta.namespace }}'
   when:
+    - "'monitoring.rhobs' in api_groups"
     - observability_strategy not in ['use_redhat', 'use_hybrid']
 
 - name: Set default prometheus service template