From b16e1bc73c0b68b6a1fe6d52f656818934694c4c Mon Sep 17 00:00:00 2001
From: Nicholas Nezis <nicholas.nezis@gmail.com>
Date: Thu, 7 Mar 2019 19:32:26 +0000
Subject: [PATCH] Changed 'dockerRoot' to a more generic name
---
production/helm/templates/promtail/daemonset.yaml | 4 ++--
production/helm/values.yaml | 2 +-
production/ksonnet/promtail/promtail.libsonnet | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/production/helm/templates/promtail/daemonset.yaml b/production/helm/templates/promtail/daemonset.yaml
index 56c4bce2..b3cbd6ce 100644
--- a/production/helm/templates/promtail/daemonset.yaml
+++ b/production/helm/templates/promtail/daemonset.yaml
@@ -48,7 +48,7 @@ spec:
- name: varlog
mountPath: /var/log
- name: varlibdockercontainers
- mountPath: {{ .Values.promtail.dockerRoot }}/containers
+ mountPath: {{ .Values.promtail.containerRootPath }}/containers
readOnly: true
env:
- name: HOSTNAME
@@ -94,4 +94,4 @@ spec:
path: /var/log
- name: varlibdockercontainers
hostPath:
- path: {{ .Values.promtail.dockerRoot }}/containers
+ path: {{ .Values.promtail.containerRootPath }}/containers
diff --git a/production/helm/values.yaml b/production/helm/values.yaml
index 5def64d8..c1364a9b 100644
--- a/production/helm/values.yaml
+++ b/production/helm/values.yaml
@@ -98,7 +98,7 @@ promtail:
deploymentStrategy: RollingUpdate
entryParser: docker
- dockerRoot: /var/lib/docker
+ containerRootPath: /var/lib/docker
image:
repository: grafana/promtail
diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet
index ea600a9e..4f41709d 100644
--- a/production/ksonnet/promtail/promtail.libsonnet
+++ b/production/ksonnet/promtail/promtail.libsonnet
@@ -12,7 +12,7 @@ k {
password: '',
scheme: 'https',
hostname: 'logs-us-west1.grafana.net',
- dataroot: '/var/lib/docker',
+ container_root_path: '/var/lib/docker',
external_labels: {},
},
@@ -217,5 +217,5 @@ k {
daemonSet.mixin.spec.template.spec.withServiceAccount('promtail') +
$.util.configVolumeMount('promtail', '/etc/promtail') +
$.util.hostVolumeMount('varlog', '/var/log', '/var/log') +
- $.util.hostVolumeMount('varlibdockercontainers', $._config.promtail_config.dataroot + '/containers', $._config.promtail_config.dataroot + '/containers', readOnly=true),
+ $.util.hostVolumeMount('varlibdockercontainers', $._config.promtail_config.container_root_path + '/containers', $._config.promtail_config.container_root_path + '/containers', readOnly=true),
}
--
GitLab