Skip to content

fix(metamcp): skip internal postgres config when using external DATAB… #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
balnibarbian wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(metamcp): skip internal postgres config when using external DATAB… #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions charts/metamcp/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ spec:
{{- if .Values.serviceAccount.create }}
serviceAccountName: {{ include "metamcp.fullname" . }}
{{- end }}
{{- /* always use internal postgres */}}
{{- $hasDBURL := and (kindIs "map" .Values.env) (hasKey .Values.env "DATABASE_URL") }}
{{- if not $hasDBURL }}
{{- /* only use init container when using internal postgres */}}
initContainers:
- name: wait-db
image: {{ .Values.postgres.image }}
Expand All @@ -59,6 +61,7 @@ spec:
secretKeyRef:
name: {{ include "metamcp.postgresFullname" . }}-secret
key: password
{{- end }}
containers:
- name: metamcp
image: {{ printf "%s:%s" .Values.image.repository .Values.image.tag | quote }}
Expand Down Expand Up @@ -86,9 +89,9 @@ spec:
key: BETTER_AUTH_SECRET
{{- end }}
{{- if not $hasDBURL }}
{{- /* internal postgres environment variables */}}
- name: DATABASE_URL
value: {{ printf "postgresql://%s:%s@%s.%s.svc.cluster.local:5432/%s?sslmode=disable" (.Values.postgres.auth.username | toString) (.Values.postgres.auth.password | toString) (include "metamcp.postgresFullname" .) .Release.Namespace (.Values.postgres.auth.database | toString) | quote }}
{{- end }}
- name: POSTGRES_HOST
value: {{ printf "%s.%s.svc.cluster.local" (include "metamcp.postgresFullname" .) .Release.Namespace | quote }}
- name: PGHOST
Expand All @@ -111,10 +114,11 @@ spec:
secretKeyRef:
name: {{ include "metamcp.postgresFullname" . }}-secret
key: password
{{- end }}
{{- /* end internal postgres envs */}}
{{- with .Values.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- /* end internal postgres envs */}}
livenessProbe:
httpGet:
path: /health
Expand Down