From fdafa10e5865adfcb8cb91b5722d209eae218b31 Mon Sep 17 00:00:00 2001
From: Edward Welch <edward.welch@grafana.com>
Date: Tue, 20 Aug 2019 15:41:57 -0400
Subject: [PATCH] feat(promtail): Make cluster role configurable
---
production/ksonnet/promtail/config.libsonnet | 1 +
production/ksonnet/promtail/promtail.libsonnet | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet
index 01c91afc..a9e13810 100644
--- a/production/ksonnet/promtail/config.libsonnet
+++ b/production/ksonnet/promtail/config.libsonnet
@@ -18,5 +18,6 @@
docker: {},
}],
},
+ promtail_cluster_role_name: 'promtail',
},
}
diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet
index bdd3b7d1..75a80b28 100644
--- a/production/ksonnet/promtail/promtail.libsonnet
+++ b/production/ksonnet/promtail/promtail.libsonnet
@@ -9,7 +9,7 @@ k + config + scrape_config {
local policyRule = $.rbac.v1beta1.policyRule,
promtail_rbac:
- $.util.rbac('promtail', [
+ $.util.rbac($._config.promtail_cluster_role_name, [
policyRule.new() +
policyRule.withApiGroups(['']) +
policyRule.withResources(['nodes', 'nodes/proxy', 'services', 'endpoints', 'pods']) +
@@ -62,7 +62,7 @@ k + config + scrape_config {
promtail_daemonset:
daemonSet.new('promtail', [$.promtail_container]) +
- daemonSet.mixin.spec.template.spec.withServiceAccount('promtail') +
+ daemonSet.mixin.spec.template.spec.withServiceAccount($._config.promtail_cluster_role_name) +
$.util.configVolumeMount('promtail', '/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