Added a clarifying comment in values.yaml to explain that values in the external secret (host, port, database) will override the corresponding values defined in external.host, external.port, and external.database.

Confirmed that the conditional blocks in deployment.yaml were already consolidated to eliminate redundancy. The file was already using a single include statement for PostgreSQL environment variables:

env:
  {{- include "eoapi.postgresqlEnv" $ | nindent 12 }}
Removed the unused eoapi.mapLegacyPostgresql helper function from _helpers.tpl as it wasn't being referenced anywhere in the codebase.

Author: emmanuelmathot

helm-chart/eoapi/templates/_helpers.tpl

@@ -344,30 +344,6 @@ Validate PostgreSQL configuration
 {{- end }}
 {{- end }}
 
-{{/*
-Map legacy configuration to new postgresql configuration
-*/}}
-{{- define "eoapi.mapLegacyPostgresql" -}}
-{{- $postgresql := dict }}
-{{- if .Values.postgrescluster.enabled }}
-  {{- $_ := set $postgresql "type" "postgrescluster" }}
-{{- else if .Values.db.enabled }}
-  {{- $_ := set $postgresql "type" "external-plaintext" }}
-  {{- $external := dict }}
-  {{- $_ := set $external "host" .Values.db.settings.secrets.POSTGRES_HOST }}
-  {{- $_ := set $external "port" .Values.db.settings.secrets.POSTGRES_PORT }}
-  {{- $_ := set $external "database" .Values.db.settings.secrets.POSTGRES_DB }}
-  {{- $credentials := dict }}
-  {{- $_ := set $credentials "username" .Values.db.settings.secrets.POSTGRES_USER }}
-  {{- $_ := set $credentials "password" .Values.db.settings.secrets.POSTGRES_PASSWORD }}
-  {{- $_ := set $external "credentials" $credentials }}
-  {{- $_ := set $postgresql "external" $external }}
-{{- else }}
-  {{- $_ := set $postgresql "type" "postgrescluster" }}
-{{- end }}
-{{- $postgresql | toYaml }}
-{{- end }}
-
 {{/*
 values.schema.json doesn't play nice combined value checks
 so we use this helper function to check autoscaling rules

helm-chart/eoapi/templates/services/deployment.yaml

@@ -75,13 +75,7 @@ spec:
         resources:
           {{- toYaml (index $v "settings" "resources") | nindent 10 }}
         env:
-          {{- if or $.Values.postgrescluster.enabled (eq $.Values.postgresql.type "postgrescluster") }}
           {{- include "eoapi.postgresqlEnv" $ | nindent 12 }}
-          {{- else if eq $.Values.postgresql.type "external-plaintext" }}
-          {{- include "eoapi.postgresqlEnv" $ | nindent 12 }}
-          {{- else if eq $.Values.postgresql.type "external-secret" }}
-          {{- include "eoapi.postgresqlEnv" $ | nindent 12 }}
-          {{- end }}
         envFrom:
           # NOTE: there's no reason we need to use a `ConfigMap` or `Secret` here to get os env vars into the pod.
           # we could just template them out here immediately with `value: $_` but this allows us

helm-chart/eoapi/values.yaml

@@ -81,6 +81,7 @@ postgresql:
         username: "username"
         password: "password"
         # Optional: if these are provided in the secret
+        # Note: These values override external.host, external.port and external.database if defined
         host: "host"
         port: "port"
         database: "database"