When using external DB, allow to configure ssl mode (#168)

zalf-rdm · Mar 13, 2024 · 31039fc · 31039fc
1 parent 468fb42
commit 31039fc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/charts/geonode/templates/_helpers.tpl b/charts/geonode/templates/_helpers.tpl
@@ -48,6 +48,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "database_ssl" -}}
+{{- if (eq .Values.postgres.type "operator") -}}
+require
+{{- else if (eq .Values.postgres.type "external") -}}
+{{ .Values.postgres.external.ssl }}
+{{- end -}}
+{{- end -}}
+
 # secret key reference for the password of user:  .Values.postgres.username
 {{- define "database_postgres_password_secret_key_ref" -}}
 {{- if (eq .Values.postgres.type "operator") -}}

diff --git a/charts/geonode/templates/geonode/geonode-env.yaml b/charts/geonode/templates/geonode/geonode-env.yaml
@@ -181,7 +181,7 @@ data:
   DATABASE_PORT: {{ include "database_port" . | quote }}
 
   # enables ssl encrypted psql connection (required by postgres-operator databases)
-  PGSSLMODE: "require"
+  PGSSLMODE: {{ include "database_ssl" . | quote }}
   POSTGRES_USER: {{ .Values.postgres.username | quote }}
   GEONODE_DATABASE: {{ .Values.postgres.geonode_databasename_and_username | quote }}
   GEONODE_GEODATABASE: {{ .Values.postgres.geodata_databasename_and_username | quote }}

diff --git a/charts/geonode/values.yaml b/charts/geonode/values.yaml
@@ -658,6 +658,7 @@ postgres:
   external:
     hostname: my-external-postgres.com
     port: 5432
+    ssl: prefer
     secret:
       # -- name of an existing Secret to use. Set, if you want to separately maintain the Secret.
       existingSecretName: ""