Skip to content

Commit 789cbd9

Browse files
committed
feat(template): Write operator file logs to an emptyDir under /var/log
This makes it possible for us to switch to a read-only root filesystem. And it causes the logs to survive a container restart.
1 parent 660d65e commit 789cbd9

2 files changed

Lines changed: 18 additions & 1 deletion

File tree

‎template/deploy/helm/[[operator]]/templates/_telemetry.tpl.j2‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
{{/*
2+
Shared by FILE_LOG_DIRECTORY and the log volume mount in deployment.yaml, which have to agree.
3+
*/}}
4+
{{- define "{[ operator.name }].telemetry.fileLogDirectory" -}}
5+
/var/log/{{ include "{[ operator.name }].appname" . }}
6+
{{- end }}
7+
18
{{/*
29
Create a list of telemetry related env vars.
310
*/}}
@@ -17,7 +24,7 @@ Create a list of telemetry related env vars.
1724
{{ end }}
1825
{{- if .fileLog.enabled }}
1926
- name: FILE_LOG_DIRECTORY
20-
value: /stackable/logs/{{ include "{[ operator.name }].appname" $ }}
27+
value: {{ include "{[ operator.name }].telemetry.fileLogDirectory" $ }}
2128
{{- end }}
2229
{{- if and .fileLog.enabled .fileLog.level }}
2330
- name: FILE_LOG_LEVEL

‎template/deploy/helm/[[operator]]/templates/deployment.yaml.j2‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ spec:
103103
periodSeconds: 3
104104
failureThreshold: 30
105105
timeoutSeconds: 3
106+
{{- if .Values.telemetry.fileLog.enabled }}
107+
volumeMounts:
108+
- name: log
109+
mountPath: {{ include "{[ operator.name }].telemetry.fileLogDirectory" . }}
110+
{{- end }}
106111
{{- with .Values.nodeSelector }}
107112
nodeSelector:
108113
{{- toYaml . | nindent 8 }}
@@ -118,6 +123,11 @@ spec:
118123
{{- with .Values.priorityClassName }}
119124
priorityClassName: {{ . }}
120125
{{- end }}
126+
{{- if .Values.telemetry.fileLog.enabled }}
127+
volumes:
128+
- name: log
129+
emptyDir: {}
130+
{{- end }}
121131
{[% else %}]
122132
# Templated Deployment disabled for this operator
123133
{[% endif %}]

0 commit comments

Comments
 (0)