Merge branch 'master' into add-renovate

.ci/ct-config.yaml

@@ -1,7 +1,4 @@
 # This file defines the config for "ct" (chart tester) used by the helm linting GitHub workflow
 
-# Here we define every possible upstream repo our charts use in `requirements.yaml`
-chart-repos:
-  - haproxy=https://haproxytech.github.io/helm-charts
-
-lint-conf: .ci/lint-config.yaml
+lint-conf: .ci/lint-config.yaml
+validate-maintainers: false

.github/workflows/on-push-lint-charts.yml

@@ -1,35 +1,35 @@
 name: Lint and Test Charts
 
 on:
-  # push:
-  #   paths:
-  #     - 'charts/**'
-  #     - '.github/**'
+  push:
+    paths:
+      - 'charts/**'
+      - '.github/**'
   pull_request:
     paths:
-      - 'charts/**'   
-      - '.github/**'        
+      - 'charts/**'
+      - '.github/**'
   workflow_dispatch:
 
 env:
-  KUBE_SCORE_VERSION: 1.12.0
-  HELM_VERSION: v3.4.1
+  KUBE_SCORE_VERSION: 1.17.0
+  HELM_VERSION: v3.13.2
 
 concurrency: 
-  group: ${{ github.head_ref }}
+  group: ${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   lint-test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
         with:
           version: ${{ env.HELM_VERSION }}
 
@@ -49,21 +49,21 @@ jobs:
     strategy:
       matrix:
         # Choose from https://hub.docker.com/r/kindest/node/tags
-        KubeVersion: [1.18.15,1.19.11,1.20.2]
+        KubeVersion: [1.27.3, 1.28.0, 1.29.0]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       # python is a requirement for the chart-testing action below (supports yamllint among other tests)
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.7
+          python-version: 3.11
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.1.0
+        uses: helm/chart-testing-action@v2.6.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -77,7 +77,7 @@ jobs:
         run: ct lint --config .ci/ct-config.yaml
 
       - name: Create ${{matrix.KubeVersion}} kind cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.5.0
         with:
           node_image: kindest/node:v${{matrix.KubeVersion}}
           cluster_name: kubernetes-${{matrix.KubeVersion}}

.github/workflows/on-push-master-publish-chart.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -26,13 +26,8 @@ jobs:
           git config user.name "$GITHUB_ACTOR"
           git config user.email "[email protected]"
 
-      # We need cert-manager already installed in the cluster because we assume the CRDs exist
-      - name: Add haproxy repo
-        run: |
-          helm repo add haprox https://haproxytech.github.io/helm-charts --force-update
-
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.1.0
+        uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 

LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright 2019 David Young
-Copyright 2020 The Docker Mailserver Helm Chart Authors
+Copyright 2020 The docker-mailserver Helm Chart Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,10 +1,6 @@
-# K8s Helm Chart for Docker Mailserver
+# K8s Helm Chart for docker-mailserver
 
-This repostitory contains a helm chart to deploy [Docker
-Mailserver](https://github.com/docker-mailserver/docker-mailserver), a
-production-ready fullstack but simple mail server, into a Kubernetes cluster.
-
-**_LOOKING FOR MAINTAINERS_**! This repository is looking for maintainers that keep the image version up to date and curate the chart. The chart is currently outdated with regards to the image itself as well as documentation and other, related topics. If you are using this Chart, it would be of much help if you provide a solution for issues you encountred in the form of a pull request.
+This repostitory contains a helm chart to deploy [docker-mailserver](https://github.com/docker-mailserver/docker-mailserver) into a Kubernetes cluster. docker-mailserver is a production-ready, fullstack mail server that supports SMTP, IMAP, LDAP, Anti-spam, Anti-virus, etc.). Just as importantly, it is designed to be simple to install and configure.
 
 ## Documentation
 

charts/docker-mailserver/Chart.lock

@@ -1,6 +1,3 @@
-dependencies:
-- name: kubernetes-ingress
-  repository: https://haproxytech.github.io/helm-charts
-  version: 1.21.1
-digest: sha256:b6fe2da4d22a2af00126a384dcf562bf98dcafaa5536e0adbeab18ebd10906a0
-generated: "2022-04-22T14:22:06.178899+12:00"
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "2024-01-28T21:49:18.990692471-08:00"

charts/docker-mailserver/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "11.0.0"
+appVersion: "13.3.1"
 description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
 name: docker-mailserver
-version: 1.0.0
+version: 3.0.0
 sources:
 - https://github.com/docker-mailserver/docker-mailserver-helm
 maintainers:
@@ -20,10 +20,5 @@ icon: https://avatars.githubusercontent.com/u/76868633?s=400&v=4
 annotations:
   artifacthub.io/changes: |
     - Breaking : Standardized app labels to app.kubernetes.io/name for Istio workload/Cilium compatibility
-    
-dependencies:
-  - name: "kubernetes-ingress"
-    version: "1.21.1"
-    repository: "https://haproxytech.github.io/helm-charts"
-    condition: haproxy.enabled
-    alias: "haproxy"
+
+dependencies: []