Skip to content

Commit

Permalink
mount /tmp as emptyDir in all pods to workaround owncloud/ocis#10378
Browse files Browse the repository at this point in the history
  • Loading branch information
wkloucek committed Oct 22, 2024
1 parent 40f4bf4 commit 531a08d
Show file tree
Hide file tree
Showing 24 changed files with 113 additions and 5 deletions.
4 changes: 4 additions & 0 deletions charts/ocis/templates/activitylog/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,16 @@ spec:
containerPort: 9197

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/antivirus/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,16 @@ spec:
containerPort: 9277

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/audit/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,16 @@ spec:
containerPort: 9229

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/clientlog/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,16 @@ spec:
containerPort: 9260

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/eventhistory/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,16 @@ spec:
containerPort: 9270

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 2 additions & 2 deletions charts/ocis/templates/frontend/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ spec:
containerPort: 9141

volumeMounts:
- name: configs
mountPath: /etc/ocis
- name: tmp-volume
mountPath: /tmp
- name: configs
mountPath: /etc/ocis

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/graph/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ spec:
containerPort: 9124

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true
Expand All @@ -230,6 +232,8 @@ spec:

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/idm/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ spec:
containerPort: 9239

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: ldap-cert
mountPath: /etc/ocis/ldap-cert
readOnly: true
Expand All @@ -128,6 +130,8 @@ spec:

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: ldap-cert
secret:
secretName: {{ include "secrets.ldapCertSecret" . }}
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/idp/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ spec:
containerPort: 9134

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: ocis-data-tmp
mountPath: /var/lib/ocis # we mount that volume to apply fsGroup to that path, so that the idp can write the temporary idp/tmp/identifier-registration.yaml file
- name: ldap-ca
Expand All @@ -94,6 +96,8 @@ spec:

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: ocis-data-tmp
emptyDir: {}
- name: ldap-ca
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/nats/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,14 @@ spec:
containerPort: 9234

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: {{ include "ocis.persistence.dataVolumeName" . }}
mountPath: /var/lib/ocis

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
{{- include "ocis.persistence.dataVolume" . | nindent 8 }}
{{- end }}
4 changes: 4 additions & 0 deletions charts/ocis/templates/notifications/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ spec:
containerPort: 9174

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true
Expand All @@ -120,6 +122,8 @@ spec:

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
8 changes: 8 additions & 0 deletions charts/ocis/templates/ocdav/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,12 @@ spec:
containerPort: 8080
- name: metrics-debug
containerPort: 9163

volumeMounts:
- name: tmp-volume
mountPath: /tmp

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
8 changes: 8 additions & 0 deletions charts/ocis/templates/ocs/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,12 @@ spec:
containerPort: 9110
- name: metrics-debug
containerPort: 9114

volumeMounts:
- name: tmp-volume
mountPath: /tmp

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
4 changes: 4 additions & 0 deletions charts/ocis/templates/policies/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ spec:
containerPort: 9129

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true
Expand All @@ -76,6 +78,8 @@ spec:

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/postprocessing/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,16 @@ spec:
containerPort: 9255

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/proxy/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,15 @@ spec:
containerPort: 9205

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: configs
mountPath: /etc/ocis

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: configs
configMap:
name: {{ .appName }}-config
4 changes: 4 additions & 0 deletions charts/ocis/templates/search/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ spec:
containerPort: 9224

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true
Expand All @@ -122,6 +124,8 @@ spec:

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
10 changes: 7 additions & 3 deletions charts/ocis/templates/settings/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,26 @@ spec:
- name: metrics-debug
containerPort: 9194

{{- if or .Values.features.roles.customRoles .Values.features.roles.customRolesConfigRef }}

volumeMounts:
- name: tmp-volume
mountPath: /tmp
{{- if or .Values.features.roles.customRoles .Values.features.roles.customRolesConfigRef }}
- name: ocis-role-config
mountPath: /etc/ocis
{{- end }}

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}

{{- if .Values.features.roles.customRoles }}
volumes:
- name: tmp-volume
emptyDir: {}
{{- if .Values.features.roles.customRoles }}
- name: ocis-role-config
configMap:
name: {{ .appName }}-role-config
{{- end }}
{{- if .Values.features.roles.customRolesConfigRef }}
volumes:
- name: ocis-role-config
configMap:
name: {{ .Values.features.roles.customRolesConfigRef }}
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/sse/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,16 @@ spec:
containerPort: 9135

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/thumbnails/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,13 @@ spec:
containerPort: 9189

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: {{ include "ocis.persistence.dataVolumeName" . }}
mountPath: /var/lib/ocis

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
{{- include "ocis.persistence.dataVolume" . | nindent 8 }}
4 changes: 4 additions & 0 deletions charts/ocis/templates/userlog/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,16 @@ spec:
containerPort: 9210

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: messaging-system-ca
mountPath: /etc/ocis/messaging-system-ca
readOnly: true

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: messaging-system-ca
{{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }}
secret:
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/web/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ spec:
containerPort: 9104

volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: configs
mountPath: /etc/ocis
{{- if .Values.configRefs.webThemeConfigRef }}
Expand All @@ -216,6 +218,8 @@ spec:

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
- name: configs
configMap:
name: {{ .appName }}-config
Expand Down
8 changes: 8 additions & 0 deletions charts/ocis/templates/webdav/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,12 @@ spec:
containerPort: 9115
- name: metrics-debug
containerPort: 9119

volumeMounts:
- name: tmp-volume
mountPath: /tmp

{{- include "ocis.imagePullSecrets" $ | nindent 6 }}
volumes:
- name: tmp-volume
emptyDir: {}
Loading

0 comments on commit 531a08d

Please sign in to comment.