Skip to content

Commit

Permalink
[molecule] fix metrics-test (#534)
Browse files Browse the repository at this point in the history
OSSM 2.2 still uses "kubernetes_namespace"
Upstream Istio Prom addon uses "namespace"
Related to kiali/kiali#4778
  • Loading branch information
jmazzitelli authored May 11, 2022
1 parent 21cbe27 commit 4d0b303
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions molecule/metrics-test/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
test_start_time: "{{ ansible_date_time.iso8601 }}"

- set_fact:
prom_namespace_label: namespace
# This used to be needed for OSSM 2.0 but no longer for 2.1
#prom_namespace_label: "{{ 'namespace' if is_maistra == True else 'kubernetes_namespace' }}"
# OSSM 2.2 uses Prometheus 2.23.0. Upstream Istio Prometheus addon uses something >2.31.0. The label is different for each.
prom_namespace_label: "{{ 'kubernetes_namespace' if is_maistra == True else 'namespace' }}"

# Operator metrics are always enabled - make sure we have them
# NOTE: Service Mesh/Maistra does NOT collect these metrics, so do not test when running in Maistra env.
Expand Down

0 comments on commit 4d0b303

Please sign in to comment.