From 2753366b80e1e87f479325a62ff7d1c132d0aa0a Mon Sep 17 00:00:00 2001 From: Bart Laarhoven Date: Tue, 4 Nov 2025 21:15:51 +0100 Subject: [PATCH 1/8] Rename port from 'http' to 'metrics' --- charts/docker-mailserver/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/docker-mailserver/templates/deployment.yaml b/charts/docker-mailserver/templates/deployment.yaml index aa9445d..311aeba 100644 --- a/charts/docker-mailserver/templates/deployment.yaml +++ b/charts/docker-mailserver/templates/deployment.yaml @@ -272,7 +272,7 @@ spec: ports: - containerPort: 9154 - name: http + name: metrics protocol: TCP resources: {{ toYaml .Values.metrics.resources | indent 12 }} From 87637018f813fef855100116dfb14b8cc27281f8 Mon Sep 17 00:00:00 2001 From: Bart Laarhoven Date: Tue, 4 Nov 2025 21:16:13 +0100 Subject: [PATCH 2/8] Change targetPort for metrics service to 'metrics' --- charts/docker-mailserver/templates/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/docker-mailserver/templates/service.yaml b/charts/docker-mailserver/templates/service.yaml index eac6ff7..cd3b83c 100644 --- a/charts/docker-mailserver/templates/service.yaml +++ b/charts/docker-mailserver/templates/service.yaml @@ -138,7 +138,7 @@ spec: {{- if .Values.metrics.enabled }} - name: metrics port: 9154 - targetPort: 9154 + targetPort: metrics {{- end }} type: {{ default "ClusterIP" .Values.service.type }} From 68472d9142acbcfe0d5e8cb1dbc9db864221a0d4 Mon Sep 17 00:00:00 2001 From: Bart Laarhoven Date: Tue, 4 Nov 2025 21:17:33 +0100 Subject: [PATCH 3/8] Use dynamic port for metrics service --- charts/docker-mailserver/templates/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/docker-mailserver/templates/service.yaml b/charts/docker-mailserver/templates/service.yaml index cd3b83c..7c7861f 100644 --- a/charts/docker-mailserver/templates/service.yaml +++ b/charts/docker-mailserver/templates/service.yaml @@ -137,7 +137,7 @@ spec: {{- if .Values.metrics.enabled }} - name: metrics - port: 9154 + port: {{ .Values.monitoring.service.port }} targetPort: metrics {{- end }} From 711e7f1cc28804484ed5db870850ef8db4bd0965 Mon Sep 17 00:00:00 2001 From: Charlie Savage Date: Thu, 6 Nov 2025 22:01:41 -0800 Subject: [PATCH 4/8] Upgrade helm --- .github/workflows/on-push-lint-charts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-push-lint-charts.yml b/.github/workflows/on-push-lint-charts.yml index e68538f..9c0e3fd 100644 --- a/.github/workflows/on-push-lint-charts.yml +++ b/.github/workflows/on-push-lint-charts.yml @@ -13,7 +13,7 @@ on: env: KUBE_SCORE_VERSION: 1.17.0 - HELM_VERSION: v3.13.2 + HELM_VERSION: v3.19.0 concurrency: group: ${{ github.ref }} @@ -29,7 +29,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v3 + uses: azure/setup-helm@v4.3.0 with: version: ${{ env.HELM_VERSION }} From 36d8e06130f8b7b777d065363cbfa27c01fd57d7 Mon Sep 17 00:00:00 2001 From: Charlie Savage Date: Thu, 6 Nov 2025 22:04:16 -0800 Subject: [PATCH 5/8] Fix failing test (which is not failing locally) --- .../tests/__snapshot__/configmap_test.yaml.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap b/charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap index cca8d4b..e8bf0c9 100644 --- a/charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap +++ b/charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap @@ -2,7 +2,7 @@ manifest should match snapshot: 1: | apiVersion: v1 data: - dovecot.cf: |2 + dovecot.cf: | haproxy_trusted_networks = 10.0.0.0/8 192.168.0.0/16 172.16.0.0/12 service imap-login { inet_listener imap { From 15bb1caa2b8ed70635fe13105003c03f0e4040f7 Mon Sep 17 00:00:00 2001 From: Charlie Savage Date: Thu, 6 Nov 2025 22:27:20 -0800 Subject: [PATCH 6/8] Formatting --- TESTING.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/TESTING.md b/TESTING.md index 42c8a16..08c61cd 100644 --- a/TESTING.md +++ b/TESTING.md @@ -34,9 +34,6 @@ To run locally: *ct* can also test a chart by deploying it to a temporary namespace in a Kubernetes cluster, and waiting for indications that the deployment has been successful. This is a good way to test how the deployment behaves "for real". - - - ct lint --config=.ci/ct-config.yaml Create a KinD cluster, by running `kind create cluster`: From 7a38d7b805a852a88b69a2bcc48031e2da085d87 Mon Sep 17 00:00:00 2001 From: Charlie Savage Date: Thu, 6 Nov 2025 22:30:35 -0800 Subject: [PATCH 7/8] Upgrade Kubernetes versions for testing --- .github/workflows/on-push-lint-charts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-push-lint-charts.yml b/.github/workflows/on-push-lint-charts.yml index 9c0e3fd..42b304b 100644 --- a/.github/workflows/on-push-lint-charts.yml +++ b/.github/workflows/on-push-lint-charts.yml @@ -64,7 +64,7 @@ jobs: strategy: matrix: # Choose from https://hub.docker.com/r/kindest/node/tags - KubeVersion: [ 1.30.10, 1.31.6, 1.32.2] + KubeVersion: [ 1.32.8, 1.33.4, 1.34.0] steps: - name: Checkout From 48a3921bc9f57dd83d20827763020ba2b02426e5 Mon Sep 17 00:00:00 2001 From: Charlie Savage Date: Thu, 6 Nov 2025 23:52:25 -0800 Subject: [PATCH 8/8] Upgrade to latest docker mailserver release (15.1.0) --- charts/docker-mailserver/Chart.yaml | 4 ++-- charts/docker-mailserver/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/docker-mailserver/Chart.yaml b/charts/docker-mailserver/Chart.yaml index e859720..c51cce4 100644 --- a/charts/docker-mailserver/Chart.yaml +++ b/charts/docker-mailserver/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "15.0.2" +appVersion: "15.1.0" description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker. name: docker-mailserver -version: 5.0.0 +version: 5.1.0 sources: - https://github.com/docker-mailserver/docker-mailserver-helm maintainers: diff --git a/charts/docker-mailserver/README.md b/charts/docker-mailserver/README.md index 4bbd5a1..229ed73 100644 --- a/charts/docker-mailserver/README.md +++ b/charts/docker-mailserver/README.md @@ -296,7 +296,7 @@ DMS does not use techniques such as permissive initial directory creation that i Quirks from the generic section also apply to NFS-backed PersistentVolumes. ## Upgrading to Version 5 -Version 5.0 upgrades docker-mailserver to version 15. This version of the chart *does* include backwards incompatible changes +Version 5.0 of the chart *does* include backwards incompatible changes. ### PersistentVolumeClaims