Skip to content

Commit 7d9eb60

Browse files
jhbeskowjhbeskow
authored
Adding a PVC for logs (#61)
Adding a PVC for logs
1 parent 08a9c09 commit 7d9eb60

File tree

13 files changed

+245
-0
lines changed

13 files changed

+245
-0
lines changed

‎charts/self-host/templates/admin.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ spec:
2828
{{- if .Values.component.admin.podServiceAccount }}
2929
serviceAccount: "{{ .Values.component.admin.podServiceAccount }}"
3030
serviceAccountName: "{{ .Values.component.admin.podServiceAccount }}"
31+
{{- end }}
32+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
33+
initContainers:
34+
- name: create-mount-subdir
35+
command:
36+
- "/bin/bash"
37+
- "-c"
38+
args: ['
39+
mkdir -p /logs/admin
40+
']
41+
image: "bitnami/kubectl:1.19"
42+
volumeMounts:
43+
- name: applogs
44+
mountPath: /logs
3145
{{- end }}
3246
containers:
3347
- name: {{ template "bitwarden.admin" . }}
@@ -58,6 +72,11 @@ spec:
5872
mountPath: /etc/bitwarden/core/aspnet-dataprotection
5973
- name: licenses
6074
mountPath: /etc/bitwarden/core/licenses
75+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
76+
- name: applogs
77+
mountPath: /etc/bitwarden/logs
78+
subPath: admin
79+
{{- end }}
6180
{{- if .Values.secrets.secretProviderClass}}
6281
- name: secrets-store-inline
6382
mountPath: "/mnt/secrets-store"
@@ -72,6 +91,11 @@ spec:
7291
- name: licenses
7392
persistentVolumeClaim:
7493
claimName: {{ template "bitwarden.licenses" . }}
94+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
95+
- name: applogs
96+
persistentVolumeClaim:
97+
claimName: {{ template "bitwarden.applogs" . }}
98+
{{- end }}
7599
{{- if .Values.secrets.secretProviderClass}}
76100
- name: secrets-store-inline
77101
csi:

‎charts/self-host/templates/api.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ spec:
2828
{{- if .Values.component.api.podServiceAccount }}
2929
serviceAccount: "{{ .Values.component.api.podServiceAccount }}"
3030
serviceAccountName: "{{ .Values.component.api.podServiceAccount }}"
31+
{{- end }}
32+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
33+
initContainers:
34+
- name: create-mount-subdir
35+
command:
36+
- "/bin/bash"
37+
- "-c"
38+
args: ['
39+
mkdir -p /logs/api
40+
']
41+
image: "bitnami/kubectl:1.19"
42+
volumeMounts:
43+
- name: applogs
44+
mountPath: /logs
3145
{{- end }}
3246
containers:
3347
- name: {{ template "bitwarden.api" . }}
@@ -60,6 +74,11 @@ spec:
6074
mountPath: /etc/bitwarden/core/aspnet-dataprotection
6175
- name: licenses
6276
mountPath: /etc/bitwarden/core/licenses
77+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
78+
- name: applogs
79+
mountPath: /etc/bitwarden/logs
80+
subPath: api
81+
{{- end }}
6382
{{- if .Values.secrets.secretProviderClass}}
6483
- name: secrets-store-inline
6584
mountPath: "/mnt/secrets-store"
@@ -77,6 +96,11 @@ spec:
7796
- name: licenses
7897
persistentVolumeClaim:
7998
claimName: {{ template "bitwarden.licenses" . }}
99+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
100+
- name: applogs
101+
persistentVolumeClaim:
102+
claimName: {{ template "bitwarden.applogs" . }}
103+
{{- end }}
80104
{{- if .Values.secrets.secretProviderClass}}
81105
- name: secrets-store-inline
82106
csi:

‎charts/self-host/templates/events.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ spec:
2828
{{- if .Values.component.events.podServiceAccount }}
2929
serviceAccount: "{{ .Values.component.events.podServiceAccount }}"
3030
serviceAccountName: "{{ .Values.component.events.podServiceAccount }}"
31+
{{- end }}
32+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
33+
initContainers:
34+
- name: create-mount-subdir
35+
command:
36+
- "/bin/bash"
37+
- "-c"
38+
args: ['
39+
mkdir -p /logs/events
40+
']
41+
image: "bitnami/kubectl:1.19"
42+
volumeMounts:
43+
- name: applogs
44+
mountPath: /logs
3145
{{- end }}
3246
containers:
3347
- name: {{ template "bitwarden.events" . }}
@@ -59,6 +73,11 @@ spec:
5973
mountPath: "/mnt/secrets-store"
6074
readOnly: true
6175
{{- end }}
76+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
77+
- name: applogs
78+
mountPath: /etc/bitwarden/logs
79+
subPath: events
80+
{{- end }}
6281
securityContext:
6382
{{ toYaml .Values.component.events.securityContext | indent 10 }}
6483
volumes:
@@ -70,6 +89,11 @@ spec:
7089
volumeAttributes:
7190
secretProviderClass: {{ .Values.secrets.secretProviderClass }}
7291
{{- end }}
92+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
93+
- name: applogs
94+
persistentVolumeClaim:
95+
claimName: {{ template "bitwarden.applogs" . }}
96+
{{- end }}
7397
7498
---
7599
apiVersion: v1

‎charts/self-host/templates/helpers.tpl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,13 @@ Name of Licenses volume
182182
{{ template "bitwarden.fullname" . }}-licenses
183183
{{- end -}}
184184

185+
{{/*
186+
Name of Logs volume
187+
*/}}
188+
{{- define "bitwarden.applogs" -}}
189+
{{ template "bitwarden.fullname" . }}-applogs
190+
{{- end -}}
191+
185192

186193
{{/*
187194
Name of MSSQL Backups volume

‎charts/self-host/templates/icons.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ spec:
2828
{{- if .Values.component.icons.podServiceAccount }}
2929
serviceAccount: "{{ .Values.component.icons.podServiceAccount }}"
3030
serviceAccountName: "{{ .Values.component.icons.podServiceAccount }}"
31+
{{- end }}
32+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
33+
initContainers:
34+
- name: create-mount-subdir
35+
command:
36+
- "/bin/bash"
37+
- "-c"
38+
args: ['
39+
mkdir -p /logs/icons
40+
']
41+
image: "bitnami/kubectl:1.19"
42+
volumeMounts:
43+
- name: applogs
44+
mountPath: /logs
3145
{{- end }}
3246
containers:
3347
- name: {{ template "bitwarden.icons" . }}
@@ -57,6 +71,11 @@ spec:
5771
mountPath: "/mnt/secrets-store"
5872
readOnly: true
5973
{{- end }}
74+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
75+
- name: applogs
76+
mountPath: /etc/bitwarden/logs
77+
subPath: icons
78+
{{- end }}
6079
resources:
6180
{{ toYaml .Values.component.icons.resources | indent 10 }}
6281
securityContext:
@@ -70,6 +89,11 @@ spec:
7089
volumeAttributes:
7190
secretProviderClass: {{ .Values.secrets.secretProviderClass }}
7291
{{- end }}
92+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
93+
- name: applogs
94+
persistentVolumeClaim:
95+
claimName: {{ template "bitwarden.applogs" . }}
96+
{{- end }}
7397
7498
---
7599
apiVersion: v1

‎charts/self-host/templates/identity.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ spec:
2828
{{- if .Values.component.identity.podServiceAccount }}
2929
serviceAccount: "{{ .Values.component.identity.podServiceAccount }}"
3030
serviceAccountName: "{{ .Values.component.identity.podServiceAccount }}"
31+
{{- end }}
32+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
33+
initContainers:
34+
- name: create-mount-subdir
35+
command:
36+
- "/bin/bash"
37+
- "-c"
38+
args: ['
39+
mkdir -p /logs/identity
40+
']
41+
image: "bitnami/kubectl:1.19"
42+
volumeMounts:
43+
- name: applogs
44+
mountPath: /logs
3145
{{- end }}
3246
containers:
3347
- name: {{ template "bitwarden.identity" . }}
@@ -62,6 +76,11 @@ spec:
6276
mountPath: /etc/bitwarden/core/aspnet-dataprotection
6377
- name: licenses
6478
mountPath: /etc/bitwarden/core/licenses
79+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
80+
- name: applogs
81+
mountPath: /etc/bitwarden/logs
82+
subPath: identity
83+
{{- end }}
6584
{{- if .Values.secrets.secretProviderClass}}
6685
- name: secrets-store-inline
6786
mountPath: "/mnt/secrets-store"
@@ -79,6 +98,11 @@ spec:
7998
- name: licenses
8099
persistentVolumeClaim:
81100
claimName: {{ template "bitwarden.licenses" . }}
101+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
102+
- name: applogs
103+
persistentVolumeClaim:
104+
claimName: {{ template "bitwarden.applogs" . }}
105+
{{- end }}
82106
{{- if .Values.secrets.secretProviderClass}}
83107
- name: secrets-store-inline
84108
csi:

‎charts/self-host/templates/notifications.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ spec:
2828
{{- if .Values.component.notifications.podServiceAccount }}
2929
serviceAccount: "{{ .Values.component.notifications.podServiceAccount }}"
3030
serviceAccountName: "{{ .Values.component.notifications.podServiceAccount }}"
31+
{{- end }}
32+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
33+
initContainers:
34+
- name: create-mount-subdir
35+
command:
36+
- "/bin/bash"
37+
- "-c"
38+
args: ['
39+
mkdir -p /logs/notifications
40+
']
41+
image: "bitnami/kubectl:1.19"
42+
volumeMounts:
43+
- name: applogs
44+
mountPath: /logs
3145
{{- end }}
3246
containers:
3347
- name: {{ template "bitwarden.notifications" . }}
@@ -59,6 +73,11 @@ spec:
5973
mountPath: "/mnt/secrets-store"
6074
readOnly: true
6175
{{- end }}
76+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
77+
- name: applogs
78+
mountPath: /etc/bitwarden/logs
79+
subPath: notifications
80+
{{- end }}
6281
securityContext:
6382
{{ toYaml .Values.component.notifications.securityContext | indent 10 }}
6483
volumes:
@@ -70,6 +89,11 @@ spec:
7089
volumeAttributes:
7190
secretProviderClass: {{ .Values.secrets.secretProviderClass }}
7291
{{- end }}
92+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
93+
- name: applogs
94+
persistentVolumeClaim:
95+
claimName: {{ template "bitwarden.applogs" . }}
96+
{{- end }}
7397
7498
---
7599
apiVersion: v1

‎charts/self-host/templates/pre-install-hook-configmap.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ data:
4444
globalSettings__oidcIdentityClientKey: {{ (randAlphaNum 64) | quote }}
4545
globalSettings__duo__aKey: {{ (randAlphaNum 64) | quote }}
4646
{{- end }}
47+
{{- if not (and .Values.volume.logs .Values.volume.logs.enabled) }}
4748
globalSettings__logDirectory: "/dev/null"
49+
{{- end }}
4850
globalSettings__logRollBySizeLimit: ""
4951
globalSettings__syslog__destination: ""
5052
globalSettings__dataProtection__directory: "/etc/bitwarden/core/aspnet-dataprotection"

‎charts/self-host/templates/scim.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ spec:
2828
{{- if .Values.component.scim.podServiceAccount }}
2929
serviceAccount: "{{ .Values.component.scim.podServiceAccount }}"
3030
serviceAccountName: "{{ .Values.component.scim.podServiceAccount }}"
31+
{{- end }}
32+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
33+
initContainers:
34+
- name: create-mount-subdir
35+
command:
36+
- "/bin/bash"
37+
- "-c"
38+
args: ['
39+
mkdir -p /logs/scim
40+
']
41+
image: "bitnami/kubectl:1.19"
42+
volumeMounts:
43+
- name: applogs
44+
mountPath: /logs
3145
{{- end }}
3246
containers:
3347
- name: {{ template "bitwarden.scim" . }}
@@ -61,6 +75,11 @@ spec:
6175
mountPath: /etc/bitwarden/core/aspnet-dataprotection
6276
- name: licenses
6377
mountPath: /etc/bitwarden/core/licenses
78+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
79+
- name: applogs
80+
mountPath: /etc/bitwarden/logs
81+
subPath: scim
82+
{{- end }}
6483
{{- if .Values.secrets.secretProviderClass}}
6584
- name: secrets-store-inline
6685
mountPath: "/mnt/secrets-store"
@@ -78,6 +97,11 @@ spec:
7897
- name: licenses
7998
persistentVolumeClaim:
8099
claimName: {{ template "bitwarden.licenses" . }}
100+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
101+
- name: applogs
102+
persistentVolumeClaim:
103+
claimName: {{ template "bitwarden.applogs" . }}
104+
{{- end }}
81105
{{- if .Values.secrets.secretProviderClass}}
82106
- name: secrets-store-inline
83107
csi:

‎charts/self-host/templates/sso.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ spec:
2828
{{- if .Values.component.sso.podServiceAccount }}
2929
serviceAccount: "{{ .Values.component.sso.podServiceAccount }}"
3030
serviceAccountName: "{{ .Values.component.sso.podServiceAccount }}"
31+
{{- end }}
32+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
33+
initContainers:
34+
- name: create-mount-subdir
35+
command:
36+
- "/bin/bash"
37+
- "-c"
38+
args: ['
39+
mkdir -p /logs/sso
40+
']
41+
image: "bitnami/kubectl:1.19"
42+
volumeMounts:
43+
- name: applogs
44+
mountPath: /logs
3145
{{- end }}
3246
containers:
3347
- name: {{ template "bitwarden.sso" . }}
@@ -62,6 +76,11 @@ spec:
6276
mountPath: /etc/bitwarden/core/aspnet-dataprotection
6377
- name: licenses
6478
mountPath: /etc/bitwarden/core/licenses
79+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
80+
- name: applogs
81+
mountPath: /etc/bitwarden/logs
82+
subPath: sso
83+
{{- end }}
6584
{{- if .Values.secrets.secretProviderClass}}
6685
- name: secrets-store-inline
6786
mountPath: "/mnt/secrets-store"
@@ -79,6 +98,11 @@ spec:
7998
- name: licenses
8099
persistentVolumeClaim:
81100
claimName: {{ template "bitwarden.licenses" . }}
101+
{{- if and .Values.volume.logs .Values.volume.logs.enabled }}
102+
- name: applogs
103+
persistentVolumeClaim:
104+
claimName: {{ template "bitwarden.applogs" . }}
105+
{{- end }}
82106
{{- if .Values.secrets.secretProviderClass}}
83107
- name: secrets-store-inline
84108
csi:

0 commit comments

Comments
 (0)