From 61be4c99dc1d2b30a9829225514a451c05c11e39 Mon Sep 17 00:00:00 2001
From: Edward Welch <edward.welch@grafana.com>
Date: Fri, 13 Sep 2019 19:10:57 -0400
Subject: [PATCH] make promtail configmap name configurable
---
production/ksonnet/promtail/config.libsonnet | 1 +
production/ksonnet/promtail/promtail.libsonnet | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet
index a9e13810..a054bbba 100644
--- a/production/ksonnet/promtail/config.libsonnet
+++ b/production/ksonnet/promtail/config.libsonnet
@@ -19,5 +19,6 @@
}],
},
promtail_cluster_role_name: 'promtail',
+ promtail_configmap_name: 'promtail',
},
}
diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet
index 75a80b28..f1fe910f 100644
--- a/production/ksonnet/promtail/promtail.libsonnet
+++ b/production/ksonnet/promtail/promtail.libsonnet
@@ -63,7 +63,7 @@ k + config + scrape_config {
promtail_daemonset:
daemonSet.new('promtail', [$.promtail_container]) +
daemonSet.mixin.spec.template.spec.withServiceAccount($._config.promtail_cluster_role_name) +
- $.util.configVolumeMount('promtail', '/etc/promtail') +
+ $.util.configVolumeMount($._config.promtail_configmap_name, '/etc/promtail') +
$.util.hostVolumeMount('varlog', '/var/log', '/var/log') +
$.util.hostVolumeMount('varlibdockercontainers', $._config.promtail_config.container_root_path + '/containers', $._config.promtail_config.container_root_path + '/containers', readOnly=true),
}
--
GitLab