easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib/kube-prometheus: bump prometheus-operator

Browse Source 
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.
This commit is contained in:
Lucas Serven
2018-08-07 17:40:34 +02:00
parent 0d35d31c1f
commit 28e3ef5a6d
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsonnet/kube-prometheus/jsonnetfile.json
View File

@@ -38,7 +38,7 @@
"subdir": "jsonnet/prometheus-operator" "subdir": "jsonnet/prometheus-operator"
} }
}, },
"version": "v0.22.2" "version": "v0.23.0"
}, },
{ {
"name": "etcd-mixin", "name": "etcd-mixin",

6
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
} }
}, },
"version": "87358f68efee390c30c7d26ea98faeee331a177a" "version": "f86bcb58b967bb41781976a2b25906fd536d3aa4"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "42f72ac60fad1022d26f1a88062689e94219d582" "version": "a17504d81e2ab5b29d97c77faf72b8d7644bbabf"
}, },
{ {
"name": "grafana", "name": "grafana",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin" "subdir": "Documentation/etcd-mixin"
} }
}, },
"version": "93be31d43a2728d1750120aeae7a483698ccead2" "version": "9ad8f4c350368d42d988dd8c05801e40f597d369"
} }
] ]
} }

3
manifests/prometheus-prometheus.yaml
View File

@@ -23,6 +23,9 @@ spec:
prometheus: k8s prometheus: k8s
role: alert-rules role: alert-rules
serviceAccountName: prometheus-k8s serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector:
matchExpressions:
- {}
serviceMonitorSelector: serviceMonitorSelector:
matchExpressions: matchExpressions:
- key: k8s-app - key: k8s-app