Skip to content

Commit fb30520

Browse files
committed
Pin prometheus version to 2.x for now
Signed-off-by: Pete Wall <pete.wall@grafana.com>
1 parent 008b3ac commit fb30520

File tree

7 files changed

+8
-2
lines changed

7 files changed

+8
-2
lines changed

.github/workflows/test-v1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ jobs:
176176
helm install alloy grafana/alloy -f "${GRAFANA_ALLOY_VALUES}" -n alloy --create-namespace --wait
177177
178178
# This prometheus instance is used pod annotation testing with https
179-
helm install prometheus-workload prometheus-community/prometheus -f "${PROMETHEUS_WORKLOAD_VALUES}" -n prometheus --create-namespace --timeout 10m --wait
179+
helm install prometheus-workload prometheus-community/prometheus --version ^2 -f "${PROMETHEUS_WORKLOAD_VALUES}" -n prometheus --create-namespace --timeout 10m --wait
180180
181181
# Deploy the Prometheus Operator CRDs, since we want to deploy Loki with a ServiceMonitor later
182182
helm install prom-crds prometheus-community/prometheus-operator-crds --wait
183183
184184
- name: Deploy Prometheus
185185
if: (steps.list-changed.outputs.changed == 'true') || (contains(github.event.pull_request.labels.*.name, 'full_test_required'))
186186
run: |
187-
helm install prometheus prometheus-community/prometheus -f "${PROMETHEUS_VALUES}" -n prometheus --create-namespace --timeout 10m --wait
187+
helm install prometheus prometheus-community/prometheus --version ^2 -f "${PROMETHEUS_VALUES}" -n prometheus --create-namespace --timeout 10m --wait
188188
189189
- name: Deploy Loki
190190
if: (steps.list-changed.outputs.changed == 'true') || (contains(github.event.pull_request.labels.*.name, 'full_test_required'))

charts/k8s-monitoring/tests/integration/auth/test-manifest.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ deployments:
66
type: helm
77
repo: https://prometheus-community.github.io/helm-charts
88
chart: prometheus
9+
version: ^2
910
namespace: prometheus
1011
valuesFile: configs/prometheus.yaml
1112
- name: passwords

charts/k8s-monitoring/tests/integration/auto-instrumentation/test-manifest.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ deployments:
66
type: helm
77
repo: https://prometheus-community.github.io/helm-charts
88
chart: prometheus
9+
version: ^2
910
namespace: prometheus
1011
valuesFile: configs/prometheus.yaml
1112
- name: loki

charts/k8s-monitoring/tests/integration/cluster-monitoring/test-manifest.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ deployments:
1414
type: helm
1515
repo: https://prometheus-community.github.io/helm-charts
1616
chart: prometheus
17+
version: ^2
1718
namespace: prometheus
1819
valuesFile: configs/prometheus.yaml
1920
- name: loki

charts/k8s-monitoring/tests/integration/control-plane-monitoring/test-manifest.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ deployments:
88
type: helm
99
repo: https://prometheus-community.github.io/helm-charts
1010
chart: prometheus
11+
version: ^2
1112
namespace: prometheus
1213
valuesFile: configs/prometheus.yaml
1314
- name: loki

charts/k8s-monitoring/tests/integration/integration-cert-manager/test-manifest.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ deployments:
66
type: helm
77
repo: https://prometheus-community.github.io/helm-charts
88
chart: prometheus
9+
version: ^2
910
namespace: prometheus
1011
valuesFile: configs/prometheus.yaml
1112
- name: cert-manager

charts/k8s-monitoring/tests/integration/integration-mysql/test-manifest.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ deployments:
66
type: helm
77
repo: https://prometheus-community.github.io/helm-charts
88
chart: prometheus
9+
version: ^2
910
namespace: prometheus
1011
valuesFile: configs/prometheus.yaml
1112

0 commit comments

Comments
 (0)