Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci/scripts/kube-score.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ helm template --values charts/$chart/ci/ci-values.yaml charts/$chart | ${KUBE_SC
--ignore-test deployment-has-poddisruptionbudget \
--ignore-test deployment-has-host-podantiaffinity \
--ignore-test pod-probes \
--ignore-test pod-probes-identical \
--ignore-test container-image-tag \
--enable-optional-test container-security-context-privileged \
--ignore-test container-security-context \
Expand Down
26 changes: 16 additions & 10 deletions charts/docker-mailserver/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,22 +184,28 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}

# check every 10s for startup, 90s for pod restart
startupProbe:
exec:
command:
- dms-healthcheck
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 9
# check every 30s for liveness, 90s for pod restart
livenessProbe:
exec:
command:
- /bin/bash
- -c
- supervisorctl status | grep -E "amavis|clamav|cron|dovecot|mailserver|opendkim|opendmarc|postfix|rsyslog" | grep RUNNING
initialDelaySeconds: 10
command:
- dms-healthcheck
periodSeconds: 30
timeoutSeconds: 5
failureThreshold: 3
# check every 10s for readiness, 30s for service removal
readinessProbe:
exec:
command:
- /bin/bash
- -c
- supervisorctl status | grep -E "mailserver|postfix" | grep RUNNING
initialDelaySeconds: 10
command:
- dms-healthcheck
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 3
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,9 @@ manifest should match snapshot:
livenessProbe:
exec:
command:
- /bin/bash
- -c
- supervisorctl status | grep -E "amavis|clamav|cron|dovecot|mailserver|opendkim|opendmarc|postfix|rsyslog" | grep RUNNING
- dms-healthcheck
failureThreshold: 3
initialDelaySeconds: 10
periodSeconds: 30
timeoutSeconds: 5
name: docker-mailserver
ports:
Expand Down Expand Up @@ -281,11 +279,9 @@ manifest should match snapshot:
readinessProbe:
exec:
command:
- /bin/bash
- -c
- supervisorctl status | grep -E "mailserver|postfix" | grep RUNNING
- dms-healthcheck
failureThreshold: 3
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
resources:
limits:
Expand All @@ -299,6 +295,13 @@ manifest should match snapshot:
securityContext:
privileged: false
readOnlyRootFilesystem: false
startupProbe:
exec:
command:
- dms-healthcheck
failureThreshold: 9
periodSeconds: 10
timeoutSeconds: 5
volumeMounts:
- mountPath: /tmp/docker-mailserver/dovecot.cf
name: dovecot-cf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,9 @@ manifest should match snapshot:
livenessProbe:
exec:
command:
- /bin/bash
- -c
- supervisorctl status | grep -E "amavis|clamav|cron|dovecot|mailserver|opendkim|opendmarc|postfix|rsyslog" | grep RUNNING
- dms-healthcheck
failureThreshold: 3
initialDelaySeconds: 10
periodSeconds: 30
timeoutSeconds: 5
name: docker-mailserver
ports:
Expand Down Expand Up @@ -281,11 +279,9 @@ manifest should match snapshot:
readinessProbe:
exec:
command:
- /bin/bash
- -c
- supervisorctl status | grep -E "mailserver|postfix" | grep RUNNING
- dms-healthcheck
failureThreshold: 3
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
resources:
limits:
Expand All @@ -299,6 +295,13 @@ manifest should match snapshot:
securityContext:
privileged: false
readOnlyRootFilesystem: false
startupProbe:
exec:
command:
- dms-healthcheck
failureThreshold: 9
periodSeconds: 10
timeoutSeconds: 5
volumeMounts:
- mountPath: /tmp/docker-mailserver/dovecot.cf
name: dovecot-cf
Expand Down
Loading