make tests more stable

Author: MichaelSp

charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap

@@ -26,7 +26,7 @@ manifest should match snapshot:
   3: |
     apiVersion: v1
     data:
-      user-patches.sh: "#!/bin/bash\n# Make sure to keep this file in sync with https://github.com/docker-mailserver/docker-mailserver/blob/master/target/postfix/master.cf!\ncat <<EOS >> /etc/postfix/master.cf\n\n# Submission with proxy\n10587     inet  n       -       n       -       -       smtpd\n  -o syslog_name=postfix/submission\n  -o smtpd_tls_security_level=encrypt\n  -o smtpd_sasl_auth_enable=yes\n  -o smtpd_sasl_type=dovecot\n  -o smtpd_reject_unlisted_recipient=no\n  -o smtpd_sasl_authenticated_header=yes\n  -o smtpd_client_restrictions=permit_sasl_authenticated,reject\n  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject\n  -o smtpd_sender_restrictions=\\$mua_sender_restrictions\n  -o smtpd_discard_ehlo_keywords=\n  -o milter_macro_daemon_name=ORIGINATING\n  -o cleanup_service_name=sender-cleanup\n  -o smtpd_upstream_proxy_protocol=haproxy  \n\n# Submissions with proxy\n10465     inet  n       -       n       -       -       smtpd\n  -o syslog_name=postfix/submissions\n  -o smtpd_tls_wrappermode=yes\n  -o smtpd_sasl_auth_enable=yes\n  -o smtpd_sasl_type=dovecot\n  -o smtpd_reject_unlisted_recipient=no\n  -o smtpd_sasl_authenticated_header=yes\n  -o smtpd_client_restrictions=permit_sasl_authenticated,reject\n  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject\n  -o smtpd_sender_restrictions=\\$mua_sender_restrictions\n  -o smtpd_discard_ehlo_keywords=\n  -o milter_macro_daemon_name=ORIGINATING\n  -o cleanup_service_name=sender-cleanup\n  -o smtpd_upstream_proxy_protocol=haproxy\nEOS\n"
+      user-patches.sh: "#!/bin/bash\n# Make sure to keep this file in sync with https://github.com/docker-mailserver/docker-mailserver/blob/master/target/postfix/master.cf!\ncat <<EOS >> /etc/postfix/master.cf\n\n# Submission with proxy\n10587     inet  n       -       n       -       -       smtpd\n  -o syslog_name=postfix/submission\n  -o smtpd_tls_security_level=encrypt\n  -o smtpd_sasl_auth_enable=yes\n  -o smtpd_sasl_type=dovecot\n  -o smtpd_reject_unlisted_recipient=no\n  -o smtpd_sasl_authenticated_header=yes\n  -o smtpd_client_restrictions=permit_sasl_authenticated,reject\n  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject\n  -o smtpd_sender_restrictions=\\$mua_sender_restrictions\n  -o smtpd_discard_ehlo_keywords=\n  -o milter_macro_daemon_name=ORIGINATING\n  -o cleanup_service_name=sender-cleanup\n  -o smtpd_upstream_proxy_protocol=haproxy  \n\n# Submissions with proxy\n10465     inet  n       -       n       -       -       smtpd\n  -o syslog_name=postfix/submissions\n  -o smtpd_tls_wrappermode=yes\n  -o smtpd_sasl_auth_enable=yes\n  -o smtpd_sasl_type=dovecot\n  -o smtpd_reject_unlisted_recipient=no\n  -o smtpd_sasl_authenticated_header=yes\n  -o smtpd_client_restrictions=permit_sasl_authenticated,reject\n  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject\n  -o smtpd_sender_restrictions=\\$mua_sender_restrictions\n  -o smtpd_discard_ehlo_keywords=\n  -o milter_macro_daemon_name=ORIGINATING\n  -o cleanup_service_name=sender-cleanup\n  -o smtpd_upstream_proxy_protocol=haproxy\n\n# Smtp with proxy\n12525     inet  n       -       n       -       1       postscreen\n  -o syslog_name=postfix/smtp-proxy\n  -o postscreen_upstream_proxy_protocol=haproxy\n  -o postscreen_cache_map=btree:$data_directory/postscreen_10025_cache\nEOS\n"
     kind: ConfigMap
     metadata:
       labels:

charts/docker-mailserver/tests/__snapshot__/deployment_test.yaml.snap

@@ -77,6 +77,8 @@ manifest should match snapshot:
                   value: "300"
                 - name: GETMAIL_POLL
                   value: "5"
+                - name: LOGROTATE_COUNT
+                  value: "4"
                 - name: LOGROTATE_INTERVAL
                   value: weekly
                 - name: LOG_LEVEL
@@ -85,8 +87,6 @@ manifest should match snapshot:
                   value: "0"
                 - name: MOVE_SPAM_TO_JUNK
                   value: "1"
-                - name: ONE_DIR
-                  value: "1"
                 - name: OVERRIDE_HOSTNAME
                   value: mail.example.com
                 - name: PERMIT_DOCKER
@@ -117,21 +117,23 @@ manifest should match snapshot:
                   value: "6"
                 - name: RSPAMD_LEARN
                   value: "0"
+                - name: RSPAMD_NEURAL
+                  value: "0"
                 - name: SA_KILL
                   value: "10"
-                - name: SA_SPAM_SUBJECT
-                  value: '***SPAM*** '
                 - name: SA_TAG
                   value: "2"
                 - name: SA_TAG2
                   value: "6.31"
                 - name: SPAMASSASSIN_SPAM_TO_INBOX
                   value: "1"
+                - name: SPAM_SUBJECT
+                  value: '***SPAM*** '
                 - name: SRS_SENDER_CLASSES
                   value: envelope_sender
                 - name: UPDATE_CHECK_INTERVAL
                   value: 1d
-              image: mailserver/docker-mailserver:13.3.1
+              image: mailserver/docker-mailserver:0.1.0
               imagePullPolicy: IfNotPresent
               livenessProbe:
                 exec:
@@ -150,6 +152,8 @@ manifest should match snapshot:
                   name: submissions
                 - containerPort: 587
                   name: submission
+                - containerPort: 12525
+                  name: smtp-proxy
                 - containerPort: 10465
                   name: subs-proxy
                 - containerPort: 10587

charts/docker-mailserver/tests/__snapshot__/secret_test.yaml.snap

@@ -77,6 +77,8 @@ manifest should match snapshot:
                   value: "300"
                 - name: GETMAIL_POLL
                   value: "5"
+                - name: LOGROTATE_COUNT
+                  value: "4"
                 - name: LOGROTATE_INTERVAL
                   value: weekly
                 - name: LOG_LEVEL
@@ -85,8 +87,6 @@ manifest should match snapshot:
                   value: "0"
                 - name: MOVE_SPAM_TO_JUNK
                   value: "1"
-                - name: ONE_DIR
-                  value: "1"
                 - name: OVERRIDE_HOSTNAME
                   value: mail.example.com
                 - name: PERMIT_DOCKER
@@ -117,21 +117,23 @@ manifest should match snapshot:
                   value: "6"
                 - name: RSPAMD_LEARN
                   value: "0"
+                - name: RSPAMD_NEURAL
+                  value: "0"
                 - name: SA_KILL
                   value: "10"
-                - name: SA_SPAM_SUBJECT
-                  value: '***SPAM*** '
                 - name: SA_TAG
                   value: "2"
                 - name: SA_TAG2
                   value: "6.31"
                 - name: SPAMASSASSIN_SPAM_TO_INBOX
                   value: "1"
+                - name: SPAM_SUBJECT
+                  value: '***SPAM*** '
                 - name: SRS_SENDER_CLASSES
                   value: envelope_sender
                 - name: UPDATE_CHECK_INTERVAL
                   value: 1d
-              image: mailserver/docker-mailserver:13.3.1
+              image: mailserver/docker-mailserver:0.1.0
               imagePullPolicy: IfNotPresent
               livenessProbe:
                 exec:
@@ -150,6 +152,8 @@ manifest should match snapshot:
                   name: submissions
                 - containerPort: 587
                   name: submission
+                - containerPort: 12525
+                  name: smtp-proxy
                 - containerPort: 10465
                   name: subs-proxy
                 - containerPort: 10587

charts/docker-mailserver/tests/configmap_test.yaml

@@ -3,6 +3,7 @@ templates:
   - configmap.yaml
 chart:
   version: 0.1.0
+  appVersion: 0.1.0
 values:
   - ../values.yaml
 tests:

charts/docker-mailserver/tests/deployment_test.yaml

@@ -3,6 +3,7 @@ templates:
   - deployment.yaml
 chart:
   version: 0.1.0
+  appVersion: 0.1.0
 values:
   - ../values.yaml
 tests:

charts/docker-mailserver/tests/pvc_test.yaml

@@ -5,6 +5,7 @@ values:
   - ../values.yaml
 chart:
   version: 0.1.0
+  appVersion: 0.1.0
 tests:
   - it: should apply annotations from persistence.annotations
     set:

charts/docker-mailserver/tests/secret_test.yaml

@@ -4,6 +4,7 @@ templates:
   - deployment.yaml
 chart:
   version: 1.0.0
+  appVersion: 0.1.0
 values:
   - ../values.yaml
 tests: