Compare commits
No commits in common. "fd5da0635c050d45cd60fda5a3b648c7e8ede2d4" and "277cb3b475c3dc3a6595a7cfd605ed45fdf94a49" have entirely different histories.
fd5da0635c
...
277cb3b475
|
@ -33,12 +33,4 @@
|
||||||
browseable = {{ .browseable | default "yes" }}
|
browseable = {{ .browseable | default "yes" }}
|
||||||
writable = {{ .writable | default "yes" }}
|
writable = {{ .writable | default "yes" }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
;EOF way past actual end of file
|
||||||
{{ if .Values.persistence.combineShares }}{{ range .Values.persistence.sharesToCombine }}
|
|
||||||
[{{ .destName }}]
|
|
||||||
path = /combined/{{ .destName }}
|
|
||||||
comment = Magic combined share
|
|
||||||
browseable = yes
|
|
||||||
writable = yes
|
|
||||||
{{- end }}{{ end }}
|
|
||||||
;EOF way past actual end of file
|
|
|
@ -40,28 +40,6 @@ spec:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
{{- if .Values.persistence.combineShares }}
|
|
||||||
- name: overlaymagic
|
|
||||||
image: busybox
|
|
||||||
command:
|
|
||||||
- /bin/sh
|
|
||||||
- -c
|
|
||||||
- --
|
|
||||||
args:
|
|
||||||
{{- range .Values.persistence.sharesToCombine }}
|
|
||||||
- mkdir -p /combined/{{ .destName }};
|
|
||||||
mkdir -p /data/overlay-{{ .destName }};
|
|
||||||
mount -t overlay -o lowerdir={{ join ":" .shares }},upperdir=/data/overlay-{{ .destName }}-upper,workdir=/data/overlay/{{ .destName }}-work overlay /combined/{{ .destName }};
|
|
||||||
sleep infinity;
|
|
||||||
{{- end }}
|
|
||||||
lifecycle:
|
|
||||||
preStop:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- /bin/sh
|
|
||||||
- -c
|
|
||||||
- {{ range .Values.persistence.sharesToCombine }}umount /combined/{{ .destName }}; {{- end }}
|
|
||||||
{{- end }}
|
|
||||||
- name: {{ .Chart.Name }}
|
- name: {{ .Chart.Name }}
|
||||||
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||||
command:
|
command:
|
||||||
|
@ -195,4 +173,4 @@ spec:
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ $fullName }}-{{ .name }}
|
claimName: {{ $fullName }}-{{ .name }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{ end -}}
|
{{ end -}}
|
|
@ -38,10 +38,6 @@ persistence:
|
||||||
other:
|
other:
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
extraPVCShares: []
|
extraPVCShares: []
|
||||||
combineShares: false
|
|
||||||
sharesToCombine:
|
|
||||||
- destName: ""
|
|
||||||
shares: []
|
|
||||||
|
|
||||||
privatePersistence:
|
privatePersistence:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
|
@ -29,6 +29,9 @@ spec:
|
||||||
- name: usenet
|
- name: usenet
|
||||||
size: 100Gi
|
size: 100Gi
|
||||||
storageClass: longhorn-fast
|
storageClass: longhorn-fast
|
||||||
|
- name: flacs
|
||||||
|
size: 1Ti
|
||||||
|
storageClass: longhorn-fast
|
||||||
path: apps-helm/samba4
|
path: apps-helm/samba4
|
||||||
repoURL: https://git.martyn.berlin/martyn/infra4talos.git
|
repoURL: https://git.martyn.berlin/martyn/infra4talos.git
|
||||||
targetRevision: HEAD
|
targetRevision: HEAD
|
||||||
|
|
Loading…
Reference in New Issue