Skip to content

Commit c542a20

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 0be51a1 commit c542a20

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
@@ -95,6 +95,11 @@ spec:
9595
- name: OPA_BUNDLE_BUILDER_CLUSTERROLE
9696
value: {{ include "{[ operator.name }].fullname" . }}-opa-bundle-builder-clusterrole
9797
{[% endif %}]
98+
{{- if .Values.telemetry.fileLog.enabled }}
99+
volumeMounts:
100+
- name: log
101+
mountPath: {{ include "{[ operator.name }].telemetry.fileLogDirectory" . }}
102+
{{- end }}
98103
{{- with .Values.nodeSelector }}
99104
nodeSelector:
100105
{{- toYaml . | nindent 8 }}
@@ -110,6 +115,11 @@ spec:
110115
{{- with .Values.priorityClassName }}
111116
priorityClassName: {{ . }}
112117
{{- end }}
118+
{{- if .Values.telemetry.fileLog.enabled }}
119+
volumes:
120+
- name: log
121+
emptyDir: {}
122+
{{- end }}
113123
{[% else %}]
114124
# Templated Deployment disabled for this operator
115125
{[% endif %}]

0 commit comments

Comments
 (0)