Merge pull request #23 from funkypenguin/add-deployment-annotations

Messed up the deployment annotations, bump version

Author: funkypenguin

charts/docker-mailserver/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "6.3.0"
 description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
 name: docker-mailserver
-version: 0.2.4
+version: 0.2.5
 sources:
 - https://github.com/funkypenguin/helm-docker-mailserver
 maintainers:

charts/docker-mailserver/values.yaml

@@ -96,12 +96,6 @@ livenessTests:
   commands:
     - "clamscan /tmp/docker-mailserver/TrustedHosts"
 
-deployment:
-
-  ## Add annotations to the deployment
-  ## Useful for using something like stash to backup data (https://stash.run/docs/v0.9.0-rc.0/guides/latest/auto-backup/workload/)
-  annotations: {}
-
 pod:
   # pod.dockermailserver section refers to the configuration of the docker-mailserver pod itself. Note that teh many environment variables which define the behaviour of docker-mailserver are configured here
   dockermailserver:
@@ -253,11 +247,16 @@ service:
 
   annotations: {}
 
-## How many versions of the deployment to run on kubernetes
-## Default: 2
 deployment:
+
+  ## How many versions of the deployment to run on kubernetes
+  ## Default: 2
   replicas: 1
 
+  ## Add annotations to the deployment
+  ## Useful for using something like stash to backup data (https://stash.run/docs/v0.9.0-rc.0/guides/latest/auto-backup/workload/)
+  annotations: {}  
+
 ## More generally, a "request" can be thought of as "how much is this container expected to need usually". it should be
 ## possible to burst outside these constraints (during a high load operation). However, Kubernetes may kill the pod
 ## if the node is under too higher load and the burst is outside its request