From 28e3ef5a6d2cd341f940c606f27d2ce7df42a7ef Mon Sep 17 00:00:00 2001
From: Lucas Serven <lserven@gmail.com>
Date: Tue, 7 Aug 2018 17:40:34 +0200
Subject: [PATCH] contrib/kube-prometheus: bump prometheus-operator
This commit bumps the version of the Prometheus Operator jsonnet
dependency in kube-prometheus. With this change, kube-prometheus now
supports Prometheus Operator v0.23.0.
---
jsonnet/kube-prometheus/jsonnetfile.json | 2 +-
jsonnetfile.lock.json | 6 +++---
manifests/prometheus-prometheus.yaml | 3 +++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index 35b98e11..1ad3ceb3 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -38,7 +38,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "v0.22.2"
+ "version": "v0.23.0"
},
{
"name": "etcd-mixin",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 6bc1aaa1..4ffa3a3d 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "87358f68efee390c30c7d26ea98faeee331a177a"
+ "version": "f86bcb58b967bb41781976a2b25906fd536d3aa4"
},
{
"name": "ksonnet",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "42f72ac60fad1022d26f1a88062689e94219d582"
+ "version": "a17504d81e2ab5b29d97c77faf72b8d7644bbabf"
},
{
"name": "grafana",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "93be31d43a2728d1750120aeae7a483698ccead2"
+ "version": "9ad8f4c350368d42d988dd8c05801e40f597d369"
}
]
}
\ No newline at end of file
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index 9a7448b6..45ce2dab 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -23,6 +23,9 @@ spec:
prometheus: k8s
role: alert-rules
serviceAccountName: prometheus-k8s
+ serviceMonitorNamespaceSelector:
+ matchExpressions:
+ - {}
serviceMonitorSelector:
matchExpressions:
- key: k8s-app
--
GitLab