Merge pull request #1237 from mayocream/update_prometheus

dev: bump prometheus to 2.31.1
cloudnativedaysjp · Nov 29, 2021 · fe5c048 · fe5c048
2 parents 8ac2399 + c1999f2
commit fe5c048
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/manifests/infra/prometheus/overlays/development/kustomization.yaml b/manifests/infra/prometheus/overlays/development/kustomization.yaml
@@ -4,6 +4,7 @@ resources:
 - https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.52.1/bundle.yaml
 - ../../base
 patchesStrategicMerge:
+- node-exporter.yaml
+- prometheus.yaml
 - prometheus-crd.yaml
 - service-selector.yaml
-- node-exporter.yaml
diff --git a/manifests/infra/prometheus/overlays/development/prometheus.yaml b/manifests/infra/prometheus/overlays/development/prometheus.yaml
@@ -0,0 +1,18 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Prometheus
+metadata:
+  labels:
+    app.kubernetes.io/version: 2.31.1
+    prometheus: k8s
+  name: k8s
+  namespace: monitoring
+spec:
+  enableFeatures: []
+  image: quay.io/prometheus/prometheus:v2.31.1
+  podMetadata:
+    labels:
+      app.kubernetes.io/version: 2.31.1
+      prometheus: k8s
+  ruleNamespaceSelector: {}
+  ruleSelector: {}
+  version: 2.31.1