tidy up validation and helper

Author: nicktrn

hosting/k8s/helm/templates/_helpers.tpl

@@ -121,7 +121,7 @@ postgresql://{{ .Values.postgres.auth.username }}:{{ .Values.postgres.auth.passw
 Check if we should use DATABASE_URL from secret
 */}}
 {{- define "trigger-v4.postgres.useSecretUrl" -}}
-{{- or (and .Values.postgres.external.databaseUrl .Values.postgres.external.existingSecret) (and .Values.postgres.external.existingSecret) -}}
+{{- and .Values.postgres.external.existingSecret -}}
 {{- end }}
 
 {{/*

hosting/k8s/helm/templates/validate-external-config.yaml

@@ -28,8 +28,8 @@ This template will fail the Helm deployment if external config is missing for re
 {{- if not .Values.s3.external.endpoint }}
 {{- fail "S3 external configuration is required when s3.deploy=false. Please provide s3.external.endpoint" }}
 {{- end }}
-{{- if and (not .Values.s3.external.existingSecret) (not .Values.s3.external.accessKeyId) }}
-{{- fail "S3 credentials are required when s3.deploy=false. Please provide either s3.external.accessKeyId or s3.external.existingSecret" }}
+{{- if and (not .Values.s3.external.existingSecret) (or (not .Values.s3.external.accessKeyId) (not .Values.s3.external.secretAccessKey)) }}
+{{- fail "S3 credentials are required when s3.deploy=false. Please provide either s3.external.existingSecret or both s3.external.accessKeyId and s3.external.secretAccessKey" }}
 {{- end }}
 {{- end }}