Skip to content
Snippets Groups Projects
Unverified Commit 2531c043 authored by paulfantom's avatar paulfantom
Browse files

jsonnet: fix conflict resolution

parent 624c6c01
No related branches found
No related tags found
No related merge requests found
......@@ -20,9 +20,8 @@ local defaults = {
for labelName in std.objectFields(defaults.commonLabels)
if !std.setMember(labelName, ['app.kubernetes.io/version'])
},
configmapReloaderImage: 'jimmidyson/configmap-reload:v0.5.0',
kubeRbacProxyImage: error 'must provide kubeRbacProxyImage',
configmapReloaderImage: error 'must provide version',
kubeRbacProxyImage: error 'must provide kubeRbacProxyImage',
port: 9115,
internalPort: 19115,
......
......@@ -7,6 +7,6 @@
"prometheus": "2.26.0",
"prometheusAdapter": "0.8.4",
"prometheusOperator": "0.47.0",
"kubeRbacProxy": "0.8.0"
"kubeRbacProxy": "0.8.0",
"configmapReload": "0.5.0"
}
\ No newline at end of file
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment