Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(4allportal): allow samba user configuration #278

Merged
merged 13 commits into from
Dec 19, 2024
Merged

feat(4allportal): allow samba user configuration #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b333d57
chore: incremental patch Chart version increase
jpkraemer-mg Dec 9, 2024
a1c28c7
feat: allow configuration in secret, values and configmap
jpkraemer-mg Dec 9, 2024
9f1bf80
chore: Update 'README.md's
jpkraemer-mg Dec 9, 2024
7de0ed4
fix: correct placement of object {}
jpkraemer-mg Dec 10, 2024
50ea0c0
chore: Merge branch 'feature/allow-samba-user-configuration' of https…
jpkraemer-mg Dec 10, 2024
984f58b
feat: add path mapping and userPath mapping to samba deployment
jpkraemer-mg Dec 10, 2024
e7c5efc
chore: Update 'README.md's
jpkraemer-mg Dec 10, 2024
6d427ad
refactor: change to webdav logic
jpkraemer-mg Dec 11, 2024
1bf964d
fix: add generated paths to mountconf shares list
jpkraemer-mg Dec 11, 2024
ff65421
chore: rename samba.paths to samba.mounts
jpkraemer-mg Dec 11, 2024
f56434a
chore: Update 'README.md's
jpkraemer-mg Dec 11, 2024
d0f99b1
chore: incremental minor Chart version increase
jpkraemer-mg Dec 19, 2024
85c5eca
chore: Update 'README.md's
jpkraemer-mg Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/4allportal/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "3.10.38"
description: A Helm chart for 4ALLPORTAL version 3.10.0 and up
name: 4allportal
version: 20.1.1
version: 20.2.0
icon: https://4allportal.com/wp-content/uploads/2022/07/cropped-4ap_logo.png
keywords:
- 4ALLPORTAL
Expand Down
4 changes: 3 additions & 1 deletion charts/4allportal/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 4allportal

![Version: 20.1.1](https://img.shields.io/badge/Version-20.1.1-informational?style=flat-square) ![AppVersion: 3.10.38](https://img.shields.io/badge/AppVersion-3.10.38-informational?style=flat-square)
![Version: 20.2.0](https://img.shields.io/badge/Version-20.2.0-informational?style=flat-square) ![AppVersion: 3.10.38](https://img.shields.io/badge/AppVersion-3.10.38-informational?style=flat-square)

A Helm chart for 4ALLPORTAL version 3.10.0 and up

Expand Down Expand Up @@ -246,6 +246,7 @@ A Helm chart for 4ALLPORTAL version 3.10.0 and up
| samba.image.repository | string | `"samba.org/samba-server"` | |
| samba.image.tag | string | `"v0.6"` | |
| samba.livenessProbe.enabled | bool | `false` | |
| samba.mounts | list | `[]` | |
| samba.nodeSelector | object | `{}` | |
| samba.podDisruptionBudget | bool | `true` | |
| samba.readinessProbe.enabled | bool | `false` | |
Expand All @@ -254,6 +255,7 @@ A Helm chart for 4ALLPORTAL version 3.10.0 and up
| samba.resources.requests.cpu | string | `"10m"` | |
| samba.resources.requests.memory | string | `"32Mi"` | |
| samba.tolerations | list | `[]` | |
| samba.users | list | `[]` | |
| users | list | `[]` | |
| webdav.affinity | object | `{}` | |
| webdav.containerSecurityContext.allowPrivilegeEscalation | bool | `false` | |
Expand Down
125 changes: 71 additions & 54 deletions charts/4allportal/templates/samba/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,58 +7,75 @@ metadata:
data:
config.json: |-
{
"samba-container-config": "v0",
"configs": {
"mountconf": {
"shares": [
"assets", "data"
],
"globals": [
"globals"
],
"instance_name": "assets",
"permissions": {
"method": "initialize-share-perms",
"status_xattr": "user.share-perms-status",
"mode": "0777"
}
}
},
"shares": {
"assets": {
"options": {
"force user": "4allportal",
"browseable": "yes",
"path": "/mnt/assets",
"read only": "no"
}
},
"data": {
"options": {
"force user": "4allportal",
"browseable": "yes",
"path": "/mnt/data",
"read only": "no"
}
}
},
"globals": {
"globals": {
"options": {
"server min protocol": "SMB3",
"server smb encrypt": "required",
"client smb encrypt": "required",
"client min protocol": "SMB3",
"disable spoolss": "yes",
"dos charset": "ascii",
"fileid:algorithm": "fsid",
"load printers": "no",
"printcap name": "/dev/null",
"printing": "bsd",
"smb ports": "445",
"vfs objects": "fileid"
}
}
}
"samba-container-config": "v0",
"configs": {
"mountconf": {
"shares": [
"assets", "data"
{{- range $mount, $i := .Values.samba.mounts -}},
{{- regexReplaceAll "\\W+" (regexReplaceAll "^/(.*)" $mount "$1") "_" | quote }}
{{- end }}
],
"globals": [
"globals"
],
"instance_name": "assets",
"permissions": {
"method": "initialize-share-perms",
"status_xattr": "user.share-perms-status",
"mode": "0777"
}
}
},
"shares": {
{{- range $mount, $perms := .Values.samba.mounts -}}
{{- regexReplaceAll "\\W+" (regexReplaceAll "^/(.*)" $mount "$1") "_" | quote | nindent 8 }}: {
"options": {
"force user": "4allportal",
"browseable": "yes",
"path": "/mnt{{- $mount }}",
"read only": "no"
{{- if $perms.users -}}
,
"valid users": {{ $perms.users | join "," | quote }}
{{- end }}
}
},
{{- end }}
"assets": {
"options": {
"force user": "4allportal",
"browseable": "yes",
"path": "/mnt/assets",
"read only": "no"
}
},
"data": {
"options": {
"force user": "4allportal",
"browseable": "yes",
"path": "/mnt/data",
"read only": "no"
}
}
},
"globals": {
"globals": {
"options": {
"server min protocol": "SMB3",
"server smb encrypt": "required",
"client smb encrypt": "required",
"client min protocol": "SMB3",
"disable spoolss": "yes",
"dos charset": "ascii",
"fileid:algorithm": "fsid",
"load printers": "no",
"printcap name": "/dev/null",
"printing": "bsd",
"smb ports": "445",
"vfs objects": "fileid"
}
}
}
}
{{- end }}
{{- end -}}
8 changes: 8 additions & 0 deletions charts/4allportal/templates/samba/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ stringData:
"samba-container-config": "v0",
"users": {
"all_entries": [
{{- with .Values.samba.users }}
{{- range $k, $v := . }}
{
"name": {{ $k | quote }},
"password": {{ $v | quote }}
},
{{- end }}
{{- end }}
{
"name": "admin",
"password": {{ .Values.samba.adminPassword | quote }}
Expand Down
2 changes: 2 additions & 0 deletions charts/4allportal/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ samba:
registry: quay.io
repository: samba.org/samba-server
tag: v0.6
users: []
mounts: []

livenessProbe:
enabled: false
Expand Down