Skip to content

Fix metrics - #158 #159

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

Merged
cfis merged 1 commit into from
Apr 17, 2025
Merged

Fix metrics - #158 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/docker-mailserver/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: "15.0.2"
description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
name: docker-mailserver
version: 4.2.0
version: 4.2.1
sources:
- https://github.com/docker-mailserver/docker-mailserver-helm
maintainers:
Expand Down
11 changes: 9 additions & 2 deletions charts/docker-mailserver/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,14 @@ If you do not enable the PROXY protocol and your mail server is not exposed usin

## Persistence

By default, the Chart assumes there are for Persistent volumes. Thus it requests four PersistentVolumeClaims which are defined using the `persistent_volume_claims` key. Each PVC can be set to an existing claim by settin the `persistent_volume_claims.<volume_name>.existing_claim` key or a new cliams. To disable creation of a PVC, set `persistent_volume_claims.<volume_name>.enabled` to false. The default PVCs have the following characteristics:
Docker-mailserver assumes there are [four](https://docker-mailserver.github.io/docker-mailserver/latest/config/advanced/optional-config/#volumes) mounted volumes:

* mail-config
* mail-data
* mail-state
* mail-log

Therefore the chart requests four PersistentVolumeClaims under the `persistent_volume_claims` key. Each PVC can be set to an existing claim by setting the `persistent_volume_claims.<volume_name>.existing_claim` key or a new claims. To disable creation of a PVC, set `persistent_volume_claims.<volume_name>.enabled` to false. The default PVCs have the following characteristics:

| PVC Name | Default Size | Mount | Description |
| ---------- | ------- | ----------------------- | -------------------------------------|
Expand All @@ -188,7 +195,7 @@ By default, the Chart assumes there are for Persistent volumes. Thus it requests
| mail-state | 1Gi | /var/mail-state | Stores [state](https://docker-mailserver.github.io/docker-mailserver/latest/faq/#what-about-the-docker-datadmsmail-state-directory) for mail services |
| mail-log | 1Gi | /var/log/mail | Stores log files |

The PVCs are then mounted to `volumeMounts` via the `persistence` key. Each `volumeMount` must specify a volume name and mount path. It is also possbile to set a subpath via the `subPath` key.
The PVCs are mounted to `volumeMounts` via the `persistence` key. Each `volumeMount` must specify a volume name and mount path. It is also possbile to set a subpath via the `subPath` key.

Extra volumes and volume mounts may be added using the `extraVolumes` and `extraVolumeMounts` keys.

Expand Down
6 changes: 2 additions & 4 deletions charts/docker-mailserver/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,7 @@ spec:

volumeMounts:
{{- range $name, $persistence := pick .Values.persistence "mail-log" "mail-state" }}
{{- if $persistence.enabled }}
- name: {{ $name }}
mountPath: {{ $persistence.mountPath }}
{{- end }}
- name: {{ $name }}
mountPath: {{ $persistence.mountPath }}
{{- end }}
{{- end }}
Loading