Samba chart: security hardening, configurable node ports, values cleanup
- Add securityContext.pod/container values with hardened defaults; the dockur/samba image requires root and a writable root filesystem, so the remaining deviations from the baseline are documented in values.yaml (caps reduced to CHOWN, DAC_OVERRIDE, FOWNER, NET_BIND_SERVICE, SETGID, SETUID; allowPrivilegeEscalation: false) - Make the NodePorts configurable (samba.smbNodePort/netbiosNodePort, defaults 30445/30139 as published before) - Rename secrets.sambaUsersRef to secrets.sambaUsersSecretRef (breaking) - Rename the ConfigMap from -config-cfm to -configmap - Add the tpl-rendered env value convention (value, secretKeyRef, configMapKeyRef forms) - Fix the CI users.conf fixture to the username:uid:groupname:gid:password format the pinned image actually parses - Bump chart to 4.0.0+up4.23.10 Part of #32
This commit is contained in:
8 files changed
+72
-11
No files matched your search
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Chart.Name }}-config-cfm
|
||||
name: {{ .Release.Name }}-{{ .Chart.Name }}-configmap
|
||||
data:
|
||||
smb.conf: |-
|
||||
[global]
|
||||
|
||||
@@ -3,4 +3,4 @@ kind: OnePasswordItem
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Chart.Name }}-users-secret
|
||||
spec:
|
||||
itemPath: {{ required "A secret-reference for the samba-users-secret must be provided" .Values.secrets.sambaUsersRef }}
|
||||
itemPath: {{ required "A secret-reference for the samba-users-secret must be provided" .Values.secrets.sambaUsersSecretRef }}
|
||||
@@ -9,11 +9,11 @@ spec:
|
||||
- protocol: TCP
|
||||
port: 445
|
||||
targetPort: 445
|
||||
nodePort: 30445
|
||||
nodePort: {{ .Values.samba.smbNodePort }}
|
||||
name: smb-port-445
|
||||
- protocol: TCP
|
||||
port: 139
|
||||
targetPort: 139
|
||||
nodePort: 30139
|
||||
nodePort: {{ .Values.samba.netbiosNodePort }}
|
||||
name: smb-port-139
|
||||
type: NodePort
|
||||
@@ -20,6 +20,29 @@ spec:
|
||||
- name: {{ .Release.Name }}-{{ .Chart.Name }}-sfs
|
||||
image: "ghcr.io/dockur/samba:{{ .Chart.AppVersion }}"
|
||||
imagePullPolicy: IfNotPresent
|
||||
{{- with .Values.samba.env }}
|
||||
env:
|
||||
{{- range $value := . }}
|
||||
{{- if $value.value }}
|
||||
- name: {{ $value.name }}
|
||||
value: {{ tpl $value.value $ | quote }}
|
||||
{{- else if $value.valueFrom }}
|
||||
{{- if $value.valueFrom.secretKeyRef }}
|
||||
- name: {{ $value.name }}
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ tpl $value.valueFrom.secretKeyRef.name $ | quote }}
|
||||
key: {{ tpl $value.valueFrom.secretKeyRef.key $ | quote }}
|
||||
{{- else if $value.valueFrom.configMapKeyRef }}
|
||||
- name: {{ $value.name }}
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
name: {{ tpl $value.valueFrom.configMapKeyRef.name $ | quote }}
|
||||
key: {{ tpl $value.valueFrom.configMapKeyRef.key $ | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
ports:
|
||||
- containerPort: 445
|
||||
protocol: TCP
|
||||
@@ -47,14 +70,16 @@ spec:
|
||||
{{- toYaml .Values.samba.startupProbe | nindent 12 }}
|
||||
resources:
|
||||
{{- include "samba.resources" .Values.samba.resources | nindent 12 }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.samba.securityContext.container | nindent 12 }}
|
||||
restartPolicy: Always
|
||||
automountServiceAccountToken: false
|
||||
securityContext:
|
||||
fsGroup: 1000
|
||||
{{- toYaml .Values.samba.securityContext.pod | nindent 8 }}
|
||||
volumes:
|
||||
- name: smb-config
|
||||
configMap:
|
||||
name: {{ .Release.Name }}-{{ .Chart.Name }}-config-cfm
|
||||
name: {{ .Release.Name }}-{{ .Chart.Name }}-configmap
|
||||
items:
|
||||
- key: smb.conf
|
||||
path: smb.conf
|
||||
|
||||
Reference in new issue
Block a user