mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-08-26 17:01:50 +02:00
Code Issues Projects Releases Wiki Activity

jsonnet: fix conflict resolution

Browse Source
This commit is contained in:
paulfantom 2021-05-03 10:01:37 +02:00
parent 624c6c0108
commit 2531c043dc
No known key found for this signature in database
GPG Key ID: 12AE0185401674E7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
View File

@ -20,10 +20,9 @@ local defaults = {
for labelName in std.objectFields(defaults.commonLabels) for labelName in std.objectFields(defaults.commonLabels)
if !std.setMember(labelName, ['app.kubernetes.io/version']) if !std.setMember(labelName, ['app.kubernetes.io/version'])
}, },
configmapReloaderImage: 'jimmidyson/configmap-reload:v0.5.0', configmapReloaderImage: error 'must provide version',
kubeRbacProxyImage: error 'must provide kubeRbacProxyImage', kubeRbacProxyImage: error 'must provide kubeRbacProxyImage',
port: 9115, port: 9115,
internalPort: 19115, internalPort: 19115,
replicas: 1, replicas: 1,

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

@ -7,6 +7,6 @@
"prometheus": "2.26.0", "prometheus": "2.26.0",
"prometheusAdapter": "0.8.4", "prometheusAdapter": "0.8.4",
"prometheusOperator": "0.47.0", "prometheusOperator": "0.47.0",
"kubeRbacProxy": "0.8.0" "kubeRbacProxy": "0.8.0",
"configmapReload": "0.5.0" "configmapReload": "0.5.0"
} }