Skip to content
This repository has been archived by the owner on Aug 22, 2022. It is now read-only.

[samba] changed samba server docker image #1402

Merged
merged 7 commits into from
Feb 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions charts/stable/samba/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: latest
appVersion: 4.15.5
description: A simple in-cluster Samba server
name: samba
version: 5.2.0
version: 6.0.0
kubeVersion: ">=1.16.0-0"
keywords:
- samba
Expand All @@ -20,4 +20,4 @@ dependencies:
annotations:
artifacthub.io/changes: |
- kind: changed
description: Upgraded `common` chart dependency to version `4.3.0`.
description: Migrated to docker image `crazy-max/samba` in order to fix https://github.com/k8s-at-home/charts/issues/1401
6 changes: 3 additions & 3 deletions charts/stable/samba/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# samba

![Version: 5.2.0](https://img.shields.io/badge/Version-5.2.0-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
![Version: 6.0.0](https://img.shields.io/badge/Version-6.0.0-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)

A simple in-cluster Samba server

Expand Down Expand Up @@ -86,15 +86,15 @@ N/A

## Changelog

### Version 5.2.0
### Version 6.0.0

#### Added

N/A

#### Changed

* Upgraded `common` chart dependency to version `4.3.0`.
* Migrated to docker image `crazy-max/samba` in order to fix https://github.com/k8s-at-home/charts/issues/1401.

#### Fixed

Expand Down
17 changes: 17 additions & 0 deletions charts/stable/samba/templates/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@

{{/* Append the hardcoded settings */}}
{{- define "samba.harcodedValues" -}}
{{- if .Values.configmap.config.enabled }}
{{/* merge Values specific annotations with podAnnotations*/}}
podAnnotations:
configmap/checksum: "{{ .Values.configmap.config.data | toYaml | sha256sum }}"
{{- end }}

{{- if .Values.configmap.config.enabled }}
{{/* Append the configMap volume to the volumes */}}
persistence:
config:
enabled: true
type: "configMap"
name: "{{ include "common.names.fullname" . }}-config"
mountPath: "/data/config.yml"
subPath: "config.yml"
{{- end }}

service:
main:
ports:
Expand Down
49 changes: 44 additions & 5 deletions charts/stable/samba/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,24 @@

image:
# -- image repository
repository: dperson/samba
repository: ghcr.io/crazy-max/samba
# -- image tag
tag: latest
tag: 4.15.5
# -- image pull policy
pullPolicy: Always

# -- environment variables. See [image docs](https://github.com/dperson/samba/blob/master/README.md) for more details.
# -- environment variables. See [image docs](https://github.com/crazy-max/docker-samba#environment-variables) for more details.
# @default -- See below
env:
# -- Set the container timezone
TZ: UTC
# SHARE1: share1;/share/samba/share1
# SHARE2: share2;/share/samba/share2
# SAMBA_WORKGROUP: NT-Domain-Name or Workgroup-Name. (default WORKGROUP)
# SAMBA_SERVER_STRING: Server string is the equivalent of the NT Description field. (default Docker Samba Server)
# SAMBA_LOG_LEVEL: Log level. (default 0)
# SAMBA_FOLLOW_SYMLINKS: Allow to follow symlinks. (default yes)
# SAMBA_WIDE_LINKS: Controls whether or not links in the UNIX file system may be followed by the server. (default yes)
# SAMBA_HOSTS_ALLOW: Set of hosts which are permitted to access a service. (default 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16)
# SAMBA_INTERFACES: Allows you to override the default network interfaces list.

# -- Configures service settings for the chart.
# @default -- See values.yaml
Expand Down Expand Up @@ -48,3 +53,37 @@ persistence:
enabled: false
type: hostPath
hostPath: /share/samba/share1

configmap:
config:
# -- Store samba configuration as a ConfigMap
enabled: false
# -- Samba configuration. See [image documentation](https://github.com/crazy-max/docker-samba#configuration) for more information.
# @default -- See values.yaml
data:
config.yml: |
auth:
- user: foo
group: foo
uid: 1000
gid: 1000
password: bar
- user: baz
group: xxx
uid: 1100
gid: 1200
password: foobar

global:
- "force user = foo"
- "force group = foo"

share:
- name: foo
path: /share/samba/share1
browsable: yes
readonly: no
guestok: no
validusers: foo
writelist: foo
veto: no