Skip to content

Commit 3525ebb

Browse files
funkypenguinfunkypenguin
authored
Add runtime/priorityClassName, update labels, clean up unused tests (docker-mailserver#54)
1 parent df990da commit 3525ebb

File tree

4 files changed

+33
-22
lines changed

4 files changed

+33
-22
lines changed

‎charts/docker-mailserver/Chart.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apiVersion: v2
2-
appVersion: "10.5.0"
2+
appVersion: "11.0.0"
33
description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
44
name: docker-mailserver
5-
version: 0.4.0
5+
version: 1.0.0
66
sources:
7-
- https://github.com/funkypenguin/helm-docker-mailserver
7+
- https://github.com/docker-mailserver/docker-mailserver-helm
88
maintainers:
99
- name: funkypenguin
1010
email: davidy@funkypenguin.co.nz
@@ -17,6 +17,10 @@ keywords:
1717
home: https://github.com/funkypenguin/helm-docker-mailserver
1818
icon: https://avatars.githubusercontent.com/u/76868633?s=400&v=4
1919

20+
annotations:
21+
artifacthub.io/changes: |
22+
- Breaking : Standardized app labels to app.kubernetes.io/name for Istio workload/Cilium compatibility
23+
2024
dependencies:
2125
- name: "kubernetes-ingress"
2226
version: "1.21.1"

‎charts/docker-mailserver/README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,6 @@ The following table lists the configurable parameters of the docker-mailserver c
210210
| `image.tag` | The image tag to use (You may prefer "latest" over "v6.1.0", for example) | `release-v6.1.0` |
211211
| `demoMode.enabled` | Start the container with a demo "user@example.com" user (password is "password") | `true` |
212212
| `haproxy.enabled` | Support HAProxy PROXY protocol on SMTP, IMAP(S), and POP3(S) connections. Provides real source IP instead of load balancer IP | `true` |
213-
| `poorMansK8sLb.enabled` | Whether to deploy containers to call webhook for [poor-mans-k8s-lb](https://www.funkypenguin.co.nz/project/a-simple-free-load-balancer-for-your-kubernetes-cluster/) | `false` |
214-
| `poorMansK8sLb.webhookUrl` | The webhook to use if [poor-mans-k8s-lb](https://www.funkypenguin.co.nz/project/a-simple-free-load-balancer-for-your-kubernetes-cluster/) is enabled via `poorMansK8sLb.enabled` | None |
215-
| `poorMansK8sLb.webhookSecret` | The secret to use if [poor-mans-k8s-lb](https://www.funkypenguin.co.nz/project/a-simple-free-load-balancer-for-your-kubernetes-cluster/) is enabled via `poorMansK8sLb.enabled` | None |
216213
| `haproxy.trustedNetworks` | The IPs (*in space-separated CIDR format*) from which to trust inbound HAProxy-enabled connections | `"10.0.0.0/8 192.168.0.0/16 172.16.0.0/16"` |
217214
| `spfTestsDisabled` | Disable all SPF-related spam checks (*if source IP of inbound connections is a problem, and you're not using haproxy*) | `false` |
218215
| `domains` | List of domains to be served | `[]` |
@@ -242,6 +239,8 @@ The following table lists the configurable parameters of the docker-mailserver c
242239
| `ssl.issuer.kind` | Whether the issuer is namespaced (`Issuer`) on cluster-wide (`ClusterIssuer`) | `ClusterIssuer` |
243240
| `ssl.dnsname` | DNS domain used for DNS01 validation | `example.com` |
244241
| `ssl.dns01provider` | The cert-manager DNS01 provider (*more details [coming](https://github.com/funkypenguin/docker-mailserver/issues/6)*) | `cloudflare` |
242+
| `runtimeClassName` | Optionally, set the pod's [runtimeClass](https://kubernetes.io/docs/concepts/containers/runtime-class/) | `""`
243+
| `priorityClassName` | Optionally, set the pod's [priorityClass](https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/) | `""`
245244

246245
#### docker-mailserver Configuration
247246

‎charts/docker-mailserver/templates/deployment.yaml‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,36 @@ spec:
3030
{{ end }}
3131
spec:
3232
runtimeClassName: {{ .Values.runtimeClassName }}
33+
priorityClassName: {{ .Values.priorityClassName }}
3334
serviceAccountName: {{ template "dockermailserver.serviceAccountName" . }}
3435
securityContext:
3536
{{ toYaml .Values.securityContext | indent 8 }}
3637
volumes:
37-
- name: "data"
38-
persistentVolumeClaim:
39-
claimName: {{ template "dockermailserver.pvcName" . }}
40-
- name: "config"
41-
emptyDir: {}
42-
- name: "configmap"
43-
configMap:
44-
name: {{ template "dockermailserver.fullname" . }}-configs
45-
- name: "opendkim-keys"
46-
secret:
47-
secretName: {{ template "dockermailserver.fullname" . }}-secrets
38+
- name: "data"
39+
persistentVolumeClaim:
40+
claimName: {{ template "dockermailserver.pvcName" . }}
41+
- name: "config"
42+
emptyDir: {}
43+
- name: "configmap"
44+
configMap:
45+
name: {{ template "dockermailserver.fullname" . }}-configs
46+
- name: "opendkim-keys"
47+
secret:
48+
secretName: {{ template "dockermailserver.fullname" . }}-secrets
4849
{{ if .Values.pod.dockermailserver.ssl_type }}
49-
- name: "ssl-cert"
50-
secret:
50+
- name: "ssl-cert"
51+
secret:
5152
{{ if .Values.ssl.useExisting }}
52-
secretName: {{ .Values.ssl.existingName }}
53+
secretName: {{ .Values.ssl.existingName }}
5354
{{- else }}
54-
secretName: {{ template "dockermailserver.fullname" . }}-tls
55+
secretName: {{ template "dockermailserver.fullname" . }}-tls
5556
{{- end }}
5657
{{- end }}
5758
{{ if .Values.additionalVolumes }}
5859
{{- toYaml .Values.additionalVolumes | indent 9 }}
5960
{{- end }}
61+
- name: tmp
62+
emptyDir: {}
6063
initContainers:
6164
- name: prep-config
6265
image: {{ .Values.initContainer.image.name }}:{{ .Values.initContainer.image.tag }}
@@ -95,9 +98,11 @@ spec:
9598
mountPath: /tmp/ssl
9699
readOnly: true
97100
{{- end }}
101+
- name: tmp
102+
mountPath: /var/tmp
98103
- name: data
99104
mountPath: /var/mail
100-
subPath: mail
105+
subPath: mail
101106
- name: data
102107
mountPath: /var/mail-state
103108
subPath: mail-state

‎charts/docker-mailserver/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ initContainer:
2929
## Optionally specify a runtimeClassName for the deployment
3030
runtimeClassName:
3131

32+
## Optionally specify a priorityClassName for the deployment
33+
priorityClassName:
34+
3235
serviceAccount:
3336
create: "true"
3437

0 commit comments

Comments
 (0)