From 4ad873c88f54a8f31d7e48c9516bc31e4b1e8668 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 14 Jan 2026 09:38:35 +0000 Subject: [PATCH 1/2] test(metrics): Use unique names for cluster-wide Prometheus resources --- tests/templates/kuttl/metrics/10-assert.yaml | 12 ------------ ...tor.yaml => 10-create-service-monitor.yaml} | 2 -- .../kuttl/metrics/10-install-prometheus.yaml | 17 ----------------- .../kuttl/metrics/11-install-prometheus.yaml | 18 ++++++++++++++++++ ...ml => 11_kube-prometheus-stack-values.yaml} | 0 5 files changed, 18 insertions(+), 31 deletions(-) delete mode 100644 tests/templates/kuttl/metrics/10-assert.yaml rename tests/templates/kuttl/metrics/{11-create-service-monitor.yaml => 10-create-service-monitor.yaml} (97%) delete mode 100644 tests/templates/kuttl/metrics/10-install-prometheus.yaml create mode 100644 tests/templates/kuttl/metrics/11-install-prometheus.yaml rename tests/templates/kuttl/metrics/{10_kube-prometheus-stack-values.yaml => 11_kube-prometheus-stack-values.yaml} (100%) diff --git a/tests/templates/kuttl/metrics/10-assert.yaml b/tests/templates/kuttl/metrics/10-assert.yaml deleted file mode 100644 index 6c215fd..0000000 --- a/tests/templates/kuttl/metrics/10-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: prometheus-prometheus-stack-kube-prom-prometheus -status: - readyReplicas: 1 - replicas: 1 diff --git a/tests/templates/kuttl/metrics/11-create-service-monitor.yaml b/tests/templates/kuttl/metrics/10-create-service-monitor.yaml similarity index 97% rename from tests/templates/kuttl/metrics/11-create-service-monitor.yaml rename to tests/templates/kuttl/metrics/10-create-service-monitor.yaml index 9579f0a..141844f 100644 --- a/tests/templates/kuttl/metrics/11-create-service-monitor.yaml +++ b/tests/templates/kuttl/metrics/10-create-service-monitor.yaml @@ -3,8 +3,6 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: stackable-opensearch - labels: - release: prometheus-stack spec: selector: matchLabels: diff --git a/tests/templates/kuttl/metrics/10-install-prometheus.yaml b/tests/templates/kuttl/metrics/10-install-prometheus.yaml deleted file mode 100644 index 33d83bf..0000000 --- a/tests/templates/kuttl/metrics/10-install-prometheus.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - # The kube-prometheus-stack Helm chart installs cluster wide - # resources, e.g. ClusterRoles. If all test cases use the same Helm - # chart version, then their contents are equal. Therefore, it is safe - # to take ownership instead of failing if the resources already exist. - - script: > - helm install prometheus-stack - --namespace $NAMESPACE - --version 77.0.1 - --values 10_kube-prometheus-stack-values.yaml - --take-ownership - --wait - oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack - timeout: 600 diff --git a/tests/templates/kuttl/metrics/11-install-prometheus.yaml b/tests/templates/kuttl/metrics/11-install-prometheus.yaml new file mode 100644 index 0000000..51192fc --- /dev/null +++ b/tests/templates/kuttl/metrics/11-install-prometheus.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + # Append the namespace to the Helm release name so that cluster-wide + # resources get unique names. + - script: | + helm install prometheus-$NAMESPACE \ + --namespace $NAMESPACE \ + --version 80.14.2 \ + --values 11_kube-prometheus-stack-values.yaml \ + --wait \ + oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack + + kubectl label servicemonitors.monitoring.coreos.com stackable-opensearch \ + --namespace $NAMESPACE \ + release=prometheus-$NAMESPACE + timeout: 600 diff --git a/tests/templates/kuttl/metrics/10_kube-prometheus-stack-values.yaml b/tests/templates/kuttl/metrics/11_kube-prometheus-stack-values.yaml similarity index 100% rename from tests/templates/kuttl/metrics/10_kube-prometheus-stack-values.yaml rename to tests/templates/kuttl/metrics/11_kube-prometheus-stack-values.yaml From 58b5b8631d72958cd0ffe7f3952e9b006cb55ad3 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 14 Jan 2026 13:15:45 +0000 Subject: [PATCH 2/2] test(metrics): Install Prometheus (and the ServiceMonitor CRD) before the ServiceMonitor --- .../kuttl/metrics/10-install-prometheus.yaml | 14 ++++++++++++++ ...ml => 10_kube-prometheus-stack-values.yaml} | 0 .../metrics/11-create-service-monitor.yaml | 7 +++++++ .../kuttl/metrics/11-install-prometheus.yaml | 18 ------------------ ...ce-monitor.yaml => 11_service-monitor.yaml} | 2 ++ 5 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 tests/templates/kuttl/metrics/10-install-prometheus.yaml rename tests/templates/kuttl/metrics/{11_kube-prometheus-stack-values.yaml => 10_kube-prometheus-stack-values.yaml} (100%) create mode 100644 tests/templates/kuttl/metrics/11-create-service-monitor.yaml delete mode 100644 tests/templates/kuttl/metrics/11-install-prometheus.yaml rename tests/templates/kuttl/metrics/{10-create-service-monitor.yaml => 11_service-monitor.yaml} (96%) diff --git a/tests/templates/kuttl/metrics/10-install-prometheus.yaml b/tests/templates/kuttl/metrics/10-install-prometheus.yaml new file mode 100644 index 0000000..59d5782 --- /dev/null +++ b/tests/templates/kuttl/metrics/10-install-prometheus.yaml @@ -0,0 +1,14 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + # Append the namespace to the Helm release name so that cluster-wide + # resources get unique names. + - script: > + helm install prometheus-$NAMESPACE + --namespace $NAMESPACE + --version 80.14.2 + --values 10_kube-prometheus-stack-values.yaml + --wait + oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack + timeout: 600 diff --git a/tests/templates/kuttl/metrics/11_kube-prometheus-stack-values.yaml b/tests/templates/kuttl/metrics/10_kube-prometheus-stack-values.yaml similarity index 100% rename from tests/templates/kuttl/metrics/11_kube-prometheus-stack-values.yaml rename to tests/templates/kuttl/metrics/10_kube-prometheus-stack-values.yaml diff --git a/tests/templates/kuttl/metrics/11-create-service-monitor.yaml b/tests/templates/kuttl/metrics/11-create-service-monitor.yaml new file mode 100644 index 0000000..f1b1578 --- /dev/null +++ b/tests/templates/kuttl/metrics/11-create-service-monitor.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + - script: > + envsubst '$NAMESPACE' < 11_service-monitor.yaml | + kubectl apply -n $NAMESPACE -f - diff --git a/tests/templates/kuttl/metrics/11-install-prometheus.yaml b/tests/templates/kuttl/metrics/11-install-prometheus.yaml deleted file mode 100644 index 51192fc..0000000 --- a/tests/templates/kuttl/metrics/11-install-prometheus.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - # Append the namespace to the Helm release name so that cluster-wide - # resources get unique names. - - script: | - helm install prometheus-$NAMESPACE \ - --namespace $NAMESPACE \ - --version 80.14.2 \ - --values 11_kube-prometheus-stack-values.yaml \ - --wait \ - oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack - - kubectl label servicemonitors.monitoring.coreos.com stackable-opensearch \ - --namespace $NAMESPACE \ - release=prometheus-$NAMESPACE - timeout: 600 diff --git a/tests/templates/kuttl/metrics/10-create-service-monitor.yaml b/tests/templates/kuttl/metrics/11_service-monitor.yaml similarity index 96% rename from tests/templates/kuttl/metrics/10-create-service-monitor.yaml rename to tests/templates/kuttl/metrics/11_service-monitor.yaml index 141844f..fe172ff 100644 --- a/tests/templates/kuttl/metrics/10-create-service-monitor.yaml +++ b/tests/templates/kuttl/metrics/11_service-monitor.yaml @@ -3,6 +3,8 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: stackable-opensearch + labels: + release: prometheus-$NAMESPACE spec: selector: matchLabels: