diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet index 01c91afc02ae107f57ee449e16f55faf43bbcade..a9e13810959af8271c01d414c44d5a4baee5ef8f 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 bdd3b7d180af041705ad323cadf064b8696ede76..75a80b28dac8d45fe46fc6650c824baf8ac2199c 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),