jsonnet: fix conflict resolution

2021-05-03 10:01:37 +02:00
parent 624c6c0108
commit 2531c043dc
2 changed files with 4 additions and 5 deletions
--- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
@@ -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,