Skip to content

Commit afb6ed2

Browse files
authored
Move sed-based patches from Helm to Dockerfile
1 parent 99d2db9 commit afb6ed2

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,11 @@ RUN set -e \
1919
#&& rm -rf /var/lib/apt/lists/* \
2020
#&& rm -rf /tmp/* /var/tmp/* $GEM_HOME/cache/*.gem \
2121
&& echo OK
22+
23+
# Patch configuration files:
24+
# - Include kube-system.conf after the configs of all other namespaces.
25+
# The original behaviour was to include kube-system.conf before all other namespaces.
26+
# - Disable inotify based watcher (i.e. only use timers) for all tail plugins.
27+
RUN set -e \
28+
&& sed -i '/^#.*kube-system/,/^$/{H; d} ; /#.*namespace annotations/,/^$/{ /^$/G }' /templates/fluent.conf \
29+
&& sed -i '/@type tail/a\ \ enable_stat_watcher false' /templates/kubernetes.conf

0 commit comments

Comments
 (0)