add way to specify shared database

This commit is contained in:
Arlan Lloyd 2025-11-12 06:50:52 +00:00
parent 58690eb428
commit 9bbdb3d7f0
6 changed files with 75 additions and 52 deletions

View File

@ -135,3 +135,11 @@ rootURL does not include
{{- define "kyoo.middlewareRootURL" -}} {{- define "kyoo.middlewareRootURL" -}}
{{ default (printf "http://%s" (include "kyoo.traefikproxy.fullname" .)) .Values.kyoo.middlewareRootURL }} {{ default (printf "http://%s" (include "kyoo.traefikproxy.fullname" .)) .Values.kyoo.middlewareRootURL }}
{{- end -}} {{- end -}}
{{/*
Create kyoo postgres base host
*/}}
{{- define "kyoo.postgres.shared.host" -}}
{{- default (printf "%s-postgres" (include "kyoo.fullname" .)) .Values.global.postgres.shared.host -}}
{{- end -}}

View File

@ -65,19 +65,19 @@ spec:
- name: PGUSER - name: PGUSER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
key: {{ .Values.global.postgres.kyoo_api.kyoo_api.userKey }} key: {{ default .Values.global.postgres.shared.userKey .Values.global.postgres.kyoo_api.kyoo_api.userKey }}
name: {{ .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }} name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }}
- name: PGPASSWORD - name: PGPASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
key: {{ .Values.global.postgres.kyoo_api.kyoo_api.passwordKey }} key: {{ default .Values.global.postgres.shared.passwordKey .Values.global.postgres.kyoo_api.kyoo_api.passwordKey }}
name: {{ .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }} name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }}
- name: PGDATABASE - name: PGDATABASE
value: {{ .Values.global.postgres.kyoo_api.database }} value: {{ default .Values.global.postgres.kyoo_api.database .Values.global.postgres.shared.databaseOverride | quote }}
- name: PGHOST - name: PGHOST
value: {{ .Values.global.postgres.kyoo_api.host | quote }} value: {{ default (include "kyoo.postgres.shared.host" .) .Values.global.postgres.kyoo_api.host | quote}}
- name: PGPORT - name: PGPORT
value: {{ .Values.global.postgres.kyoo_api.port | quote }} value: {{ default .Values.global.postgres.shared.port .Values.global.postgres.kyoo_api.port | quote }}
- name: PGSSLMODE - name: PGSSLMODE
value: {{ .Values.global.postgres.kyoo_api.sslmode | quote }} value: {{ .Values.global.postgres.kyoo_api.sslmode | quote }}
{{- with (concat .Values.global.extraEnv .Values.api.kyoo_api.extraEnv) }} {{- with (concat .Values.global.extraEnv .Values.api.kyoo_api.extraEnv) }}

View File

@ -81,19 +81,19 @@ spec:
- name: PGUSER - name: PGUSER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
key: {{ .Values.global.postgres.kyoo_auth.kyoo_auth.userKey }} key: {{ default .Values.global.postgres.shared.userKey .Values.global.postgres.kyoo_auth.kyoo_auth.userKey }}
name: {{ .Values.global.postgres.kyoo_auth.kyoo_auth.existingSecret }} name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_auth.kyoo_auth.existingSecret }}
- name: PGPASSWORD - name: PGPASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
key: {{ .Values.global.postgres.kyoo_auth.kyoo_auth.passwordKey }} key: {{ default .Values.global.postgres.shared.passwordKey .Values.global.postgres.kyoo_auth.kyoo_auth.passwordKey }}
name: {{ .Values.global.postgres.kyoo_auth.kyoo_auth.existingSecret }} name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_auth.kyoo_auth.existingSecret }}
- name: PGDATABASE - name: PGDATABASE
value: {{ .Values.global.postgres.kyoo_auth.database }} value: {{ default .Values.global.postgres.kyoo_auth.database .Values.global.postgres.shared.databaseOverride | quote }}
- name: PGHOST - name: PGHOST
value: {{ .Values.global.postgres.kyoo_auth.host | quote }} value: {{ default (include "kyoo.postgres.shared.host" .) .Values.global.postgres.kyoo_auth.host | quote}}
- name: PGPORT - name: PGPORT
value: {{ .Values.global.postgres.kyoo_auth.port | quote }} value: {{ default .Values.global.postgres.shared.port .Values.global.postgres.kyoo_auth.port | quote }}
- name: PGSSLMODE - name: PGSSLMODE
value: {{ .Values.global.postgres.kyoo_auth.sslmode | quote }} value: {{ .Values.global.postgres.kyoo_auth.sslmode | quote }}
{{- if .Values.kyoo.auth.privatekey.existingSecret }} {{- if .Values.kyoo.auth.privatekey.existingSecret }}

View File

@ -78,19 +78,19 @@ spec:
- name: PGUSER - name: PGUSER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
key: {{ .Values.global.postgres.kyoo_scanner.kyoo_scanner.userKey }} key: {{ default .Values.global.postgres.shared.userKey .Values.global.postgres.kyoo_scanner.kyoo_scanner.userKey }}
name: {{ .Values.global.postgres.kyoo_scanner.kyoo_scanner.existingSecret }} name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_scanner.kyoo_scanner.existingSecret }}
- name: PGPASSWORD - name: PGPASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
key: {{ .Values.global.postgres.kyoo_scanner.kyoo_scanner.passwordKey }} key: {{ default .Values.global.postgres.shared.passwordKey .Values.global.postgres.kyoo_scanner.kyoo_scanner.passwordKey }}
name: {{ .Values.global.postgres.kyoo_scanner.kyoo_scanner.existingSecret }} name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_scanner.kyoo_scanner.existingSecret }}
- name: PGDATABASE - name: PGDATABASE
value: {{ .Values.global.postgres.kyoo_scanner.database }} value: {{ default .Values.global.postgres.kyoo_scanner.database .Values.global.postgres.shared.databaseOverride | quote }}
- name: PGHOST - name: PGHOST
value: {{ .Values.global.postgres.kyoo_scanner.host | quote }} value: {{ default (include "kyoo.postgres.shared.host" .) .Values.global.postgres.kyoo_scanner.host | quote}}
- name: PGPORT - name: PGPORT
value: {{ .Values.global.postgres.kyoo_scanner.port | quote }} value: {{ default .Values.global.postgres.shared.port .Values.global.postgres.kyoo_scanner.port | quote }}
- name: PGSSLMODE - name: PGSSLMODE
value: {{ .Values.global.postgres.kyoo_scanner.sslmode | quote }} value: {{ .Values.global.postgres.kyoo_scanner.sslmode | quote }}
{{- with (concat .Values.global.extraEnv .Values.scanner.kyoo_scanner.extraEnv) }} {{- with (concat .Values.global.extraEnv .Values.scanner.kyoo_scanner.extraEnv) }}

View File

@ -76,19 +76,19 @@ spec:
- name: PGUSER - name: PGUSER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
key: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.userKey }} key: {{ default .Values.global.postgres.shared.userKey .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.userKey }}
name: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.existingSecret }} name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.existingSecret }}
- name: PGPASSWORD - name: PGPASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
key: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.passwordKey }} key: {{ default .Values.global.postgres.shared.passwordKey .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.passwordKey }}
name: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.existingSecret }} name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.existingSecret }}
- name: PGDATABASE - name: PGDATABASE
value: {{ .Values.global.postgres.kyoo_transcoder.database | quote }} value: {{ default .Values.global.postgres.kyoo_transcoder.database .Values.global.postgres.shared.databaseOverride | quote }}
- name: PGHOST - name: PGHOST
value: {{ .Values.global.postgres.kyoo_transcoder.host | quote }} value: {{ default (include "kyoo.postgres.shared.host" .) .Values.global.postgres.kyoo_transcoder.host | quote}}
- name: PGPORT - name: PGPORT
value: {{ .Values.global.postgres.kyoo_transcoder.port | quote }} value: {{ default .Values.global.postgres.shared.port .Values.global.postgres.kyoo_transcoder.port | quote }}
- name: PGSSLMODE - name: PGSSLMODE
value: {{ .Values.global.postgres.kyoo_transcoder.sslmode | quote }} value: {{ .Values.global.postgres.kyoo_transcoder.sslmode | quote }}
{{- with (concat .Values.global.extraEnv .Values.transcoder.kyoo_transcoder.extraEnv) }} {{- with (concat .Values.global.extraEnv .Values.transcoder.kyoo_transcoder.extraEnv) }}

View File

@ -24,50 +24,65 @@ global:
user: kyoo_all user: kyoo_all
passwordKey: postgres_password passwordKey: postgres_password
existingSecret: bigsecret existingSecret: bigsecret
# kyoo settings for connecting to kyoo_api database # shared postgres settings
kyoo_api: shared:
host: kyoo-postgres # base setting for specifying host for all kyoo workloads
# defaults to <release-name>-postgres
host: ~
# base setting for specifying ports for all kyoo workloads
port: 5432 port: 5432
# setting the database here will override the other database settings
databaseOverride: ~
# base setting for specifying existingSecret for all kyoo workloads
existingSecret: bigsecret
# base setting for specifying userKey for all kyoo workloads
userKey: postgres_user
# base setting for specifying passwordKey for all kyoo workloads
passwordKey: postgres_password
# overlay settings for connecting to kyoo_api database
kyoo_api:
host: ~
port: ~
database: kyoo_api database: kyoo_api
sslmode: prefer sslmode: prefer
# kyoo_api workload specific settings # kyoo_api workload specific settings
kyoo_api: kyoo_api:
userKey: postgres_user userKey: ~
passwordKey: postgres_password passwordKey: ~
existingSecret: bigsecret existingSecret: ~
# kyoo settings for connecting to kyoo_auth database # overlay settings for connecting to kyoo_auth database
kyoo_auth: kyoo_auth:
host: kyoo-postgres host: ~
port: 5432 port: ~
database: kyoo_auth database: kyoo_auth
sslmode: prefer sslmode: prefer
# kyoo_auth workload specific settings # kyoo_auth workload specific settings
kyoo_auth: kyoo_auth:
userKey: postgres_user userKey: ~
passwordKey: postgres_password passwordKey: ~
existingSecret: bigsecret existingSecret: ~
# kyoo settings for connecting to kyoo_scanner database # overlay settings for connecting to kyoo_scanner database
kyoo_scanner: kyoo_scanner:
host: kyoo-postgres host: ~
port: 5432 port: ~
database: kyoo_scanner database: kyoo_scanner
sslmode: prefer sslmode: prefer
# kyoo_scanner workload specific settings # kyoo_scanner workload specific settings
kyoo_scanner: kyoo_scanner:
userKey: postgres_user userKey: ~
passwordKey: postgres_password passwordKey: ~
existingSecret: bigsecret existingSecret: ~
# kyoo settings for connecting to kyoo_transcoder database # overlay settings for connecting to kyoo_transcoder database
kyoo_transcoder: kyoo_transcoder:
host: kyoo-postgres host: ~
port: 5432 port: ~
database: kyoo_transcoder database: kyoo_transcoder
sslmode: prefer sslmode: prefer
# kyoo_transcoder workload specific settings # kyoo_transcoder workload specific settings
kyoo_transcoder: kyoo_transcoder:
userKey: postgres_user userKey: ~
passwordKey: postgres_password passwordKey: ~
existingSecret: bigsecret existingSecret: ~
# kyoo application settings # kyoo application settings
kyoo: kyoo: