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
12 changes: 6 additions & 6 deletions helm/defectdojo/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ Create the name of the service account to use
*/}}
{{- define "postgresql.hostname" -}}
{{- if .Values.postgresql.enabled -}}
{{- if eq .Values.postgresql.architecture "replication" -}}
{{- printf "%s-%s-%s" .Release.Name "postgresql" .Values.postgresql.primary.name | trunc 63 | trimSuffix "-" -}}
{{- if eq .Values.postgresql.architecture "replication" -}}
{{- printf "%s-%s-%s" .Release.Name "postgresql" .Values.postgresql.primary.name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- else -}}
{{- printf "%s" .Values.postgresql.postgresServer -}}
{{- printf "%s" ( .Values.postgresql.postgresServer | default "127.0.0.1" ) -}}
{{- end -}}
{{- end -}}
{{- define "redis.hostname" -}}
Expand Down
7 changes: 3 additions & 4 deletions helm/defectdojo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,9 @@ initializer:
staticName: false

postgresql:
# To use an external PostgreSQL instance (like CloudSQL), set enabled to false, set items in auth part for authentication,
# and uncomment the line below:
# postgresServer: "127.0.0.1"
enabled: true
auth:
username: defectdojo
Expand Down Expand Up @@ -444,10 +447,6 @@ postgresql:
chmod:
enabled: false

# To use an external PostgreSQL instance, set enabled to false and uncomment
# the line below:
# postgresServer: "127.0.0.1"

# Google CloudSQL support in GKE via gce-proxy
cloudsql:
# To use CloudSQL in GKE set 'enable: true'
Expand Down