diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 8fb022c8..23186793 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -134,4 +134,12 @@ rootURL does not include */}} {{- define "kyoo.middlewareRootURL" -}} {{ default (printf "http://%s" (include "kyoo.traefikproxy.fullname" .)) .Values.kyoo.middlewareRootURL }} +{{- end -}} + + +{{/* +Create kyoo postgres base host +*/}} +{{- define "kyoo.postgres.shared.host" -}} +{{- default (printf "%s-postgres" (include "kyoo.fullname" .)) .Values.global.postgres.shared.host -}} {{- end -}} \ No newline at end of file diff --git a/chart/templates/api/deployment.yaml b/chart/templates/api/deployment.yaml index 1dcba53f..5880280c 100644 --- a/chart/templates/api/deployment.yaml +++ b/chart/templates/api/deployment.yaml @@ -65,19 +65,19 @@ spec: - name: PGUSER valueFrom: secretKeyRef: - key: {{ .Values.global.postgres.kyoo_api.kyoo_api.userKey }} - name: {{ .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }} + key: {{ default .Values.global.postgres.shared.userKey .Values.global.postgres.kyoo_api.kyoo_api.userKey }} + name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }} - name: PGPASSWORD valueFrom: secretKeyRef: - key: {{ .Values.global.postgres.kyoo_api.kyoo_api.passwordKey }} - name: {{ .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }} + key: {{ default .Values.global.postgres.shared.passwordKey .Values.global.postgres.kyoo_api.kyoo_api.passwordKey }} + name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }} - 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 - value: {{ .Values.global.postgres.kyoo_api.host | quote }} + value: {{ default (include "kyoo.postgres.shared.host" .) .Values.global.postgres.kyoo_api.host | quote}} - 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 value: {{ .Values.global.postgres.kyoo_api.sslmode | quote }} {{- with (concat .Values.global.extraEnv .Values.api.kyoo_api.extraEnv) }} diff --git a/chart/templates/auth/deployment.yaml b/chart/templates/auth/deployment.yaml index 8b1e7ea9..1656869b 100644 --- a/chart/templates/auth/deployment.yaml +++ b/chart/templates/auth/deployment.yaml @@ -81,19 +81,19 @@ spec: - name: PGUSER valueFrom: secretKeyRef: - key: {{ .Values.global.postgres.kyoo_auth.kyoo_auth.userKey }} - name: {{ .Values.global.postgres.kyoo_auth.kyoo_auth.existingSecret }} + key: {{ default .Values.global.postgres.shared.userKey .Values.global.postgres.kyoo_auth.kyoo_auth.userKey }} + name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_auth.kyoo_auth.existingSecret }} - name: PGPASSWORD valueFrom: secretKeyRef: - key: {{ .Values.global.postgres.kyoo_auth.kyoo_auth.passwordKey }} - name: {{ .Values.global.postgres.kyoo_auth.kyoo_auth.existingSecret }} + key: {{ default .Values.global.postgres.shared.passwordKey .Values.global.postgres.kyoo_auth.kyoo_auth.passwordKey }} + name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_auth.kyoo_auth.existingSecret }} - 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 - value: {{ .Values.global.postgres.kyoo_auth.host | quote }} + value: {{ default (include "kyoo.postgres.shared.host" .) .Values.global.postgres.kyoo_auth.host | quote}} - 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 value: {{ .Values.global.postgres.kyoo_auth.sslmode | quote }} {{- if .Values.kyoo.auth.privatekey.existingSecret }} diff --git a/chart/templates/scanner/deployment.yaml b/chart/templates/scanner/deployment.yaml index deaca971..48a3ebb0 100644 --- a/chart/templates/scanner/deployment.yaml +++ b/chart/templates/scanner/deployment.yaml @@ -78,19 +78,19 @@ spec: - name: PGUSER valueFrom: secretKeyRef: - key: {{ .Values.global.postgres.kyoo_scanner.kyoo_scanner.userKey }} - name: {{ .Values.global.postgres.kyoo_scanner.kyoo_scanner.existingSecret }} + key: {{ default .Values.global.postgres.shared.userKey .Values.global.postgres.kyoo_scanner.kyoo_scanner.userKey }} + name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_scanner.kyoo_scanner.existingSecret }} - name: PGPASSWORD valueFrom: secretKeyRef: - key: {{ .Values.global.postgres.kyoo_scanner.kyoo_scanner.passwordKey }} - name: {{ .Values.global.postgres.kyoo_scanner.kyoo_scanner.existingSecret }} + key: {{ default .Values.global.postgres.shared.passwordKey .Values.global.postgres.kyoo_scanner.kyoo_scanner.passwordKey }} + name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_scanner.kyoo_scanner.existingSecret }} - 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 - value: {{ .Values.global.postgres.kyoo_scanner.host | quote }} + value: {{ default (include "kyoo.postgres.shared.host" .) .Values.global.postgres.kyoo_scanner.host | quote}} - 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 value: {{ .Values.global.postgres.kyoo_scanner.sslmode | quote }} {{- with (concat .Values.global.extraEnv .Values.scanner.kyoo_scanner.extraEnv) }} diff --git a/chart/templates/transcoder/deployment.yaml b/chart/templates/transcoder/deployment.yaml index 36b6614e..e80b2414 100644 --- a/chart/templates/transcoder/deployment.yaml +++ b/chart/templates/transcoder/deployment.yaml @@ -76,19 +76,19 @@ spec: - name: PGUSER valueFrom: secretKeyRef: - key: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.userKey }} - name: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.existingSecret }} + key: {{ default .Values.global.postgres.shared.userKey .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.userKey }} + name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.existingSecret }} - name: PGPASSWORD valueFrom: secretKeyRef: - key: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.passwordKey }} - name: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.existingSecret }} + key: {{ default .Values.global.postgres.shared.passwordKey .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.passwordKey }} + name: {{ default .Values.global.postgres.shared.existingSecret .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.existingSecret }} - 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 - value: {{ .Values.global.postgres.kyoo_transcoder.host | quote }} + value: {{ default (include "kyoo.postgres.shared.host" .) .Values.global.postgres.kyoo_transcoder.host | quote}} - 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 value: {{ .Values.global.postgres.kyoo_transcoder.sslmode | quote }} {{- with (concat .Values.global.extraEnv .Values.transcoder.kyoo_transcoder.extraEnv) }} diff --git a/chart/values.yaml b/chart/values.yaml index d44b50e7..9e33a1a3 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -24,50 +24,65 @@ global: user: kyoo_all passwordKey: postgres_password existingSecret: bigsecret - # kyoo settings for connecting to kyoo_api database - kyoo_api: - host: kyoo-postgres + # shared postgres settings + shared: + # base setting for specifying host for all kyoo workloads + # defaults to -postgres + host: ~ + # base setting for specifying ports for all kyoo workloads 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 sslmode: prefer # kyoo_api workload specific settings kyoo_api: - userKey: postgres_user - passwordKey: postgres_password - existingSecret: bigsecret - # kyoo settings for connecting to kyoo_auth database + userKey: ~ + passwordKey: ~ + existingSecret: ~ + # overlay settings for connecting to kyoo_auth database kyoo_auth: - host: kyoo-postgres - port: 5432 + host: ~ + port: ~ database: kyoo_auth sslmode: prefer # kyoo_auth workload specific settings kyoo_auth: - userKey: postgres_user - passwordKey: postgres_password - existingSecret: bigsecret - # kyoo settings for connecting to kyoo_scanner database + userKey: ~ + passwordKey: ~ + existingSecret: ~ + # overlay settings for connecting to kyoo_scanner database kyoo_scanner: - host: kyoo-postgres - port: 5432 + host: ~ + port: ~ database: kyoo_scanner sslmode: prefer # kyoo_scanner workload specific settings kyoo_scanner: - userKey: postgres_user - passwordKey: postgres_password - existingSecret: bigsecret - # kyoo settings for connecting to kyoo_transcoder database + userKey: ~ + passwordKey: ~ + existingSecret: ~ + # overlay settings for connecting to kyoo_transcoder database kyoo_transcoder: - host: kyoo-postgres - port: 5432 + host: ~ + port: ~ database: kyoo_transcoder sslmode: prefer # kyoo_transcoder workload specific settings kyoo_transcoder: - userKey: postgres_user - passwordKey: postgres_password - existingSecret: bigsecret + userKey: ~ + passwordKey: ~ + existingSecret: ~ # kyoo application settings kyoo: