Utilize bjw-s's common Helm library. #13

Merged
konrad merged 41 commits from :new-helm-chart into main 2023-11-07 14:47:24 +00:00
1 changed files with 19 additions and 13 deletions
Showing only changes of commit 3df883fcbd - Show all commits

View File

@ -4,18 +4,6 @@
## Refer there for more detail about the supported values.
## Any values that you find in the above `values.yaml` can be provided to this chart and are then rendered.
# These environment variables are shared between all the vikunja components
env:
VIKUNJA_REDIS_HOST: '{{ printf "%s-redis-master" .Release.Name }}'
VIKUNJA_REDIS_DB: "{{ .Release.Name }}"
VIKUNJA_DATABASE_HOST: "{{ .Release.Name }}-postgresql"
VIKUNJA_DATABASE_USER: "{{ .Values.postgresql.global.postgresql.auth.username }}"
VIKUNJA_DATABASE_DATABASE: "{{ .Values.postgresql.global.postgresql.auth.database }}"
# -- You should provide your own secret outside of this helm-chart and use `postgresql.global.postgresql.auth.existingSecret` to provide credentials to the postgresql instance
VIKUNJA_DATABASE_PASSWORD: "{{ .Values.postgresql.global.postgresql.auth.password }}"
VIKUNJA_TYPESENSE_APIKEY: "{{ .Values.typesense.env.TYPESENSE_API_KEY }}"
VIKUNJA_TYPESENSE_URL: '{{ printf "%s-typesense" .Release.Name }}'
image:
tag: 0.21.0
perfectra1n marked this conversation as resolved Outdated

Is there a reason we're using env here and not the config directly?

We should still be able to configure Vikunja as it can be done currently: https://kolaente.dev/vikunja/helm-chart/src/branch/main/values.yaml#L142

There are things that can't be configured via env like openid providers.

Is there a reason we're using env here and not the config directly? We should still be able to configure Vikunja as it can be done currently: https://kolaente.dev/vikunja/helm-chart/src/branch/main/values.yaml#L142 There are things that can't be configured via env like openid providers.

Ah, didn't know that. I thought everything was configurable via env variables (which I've always found easier to manage), but I'll go ahead and use the config instead.

Ah, didn't know that. I thought everything was configurable via `env` variables (which I've always found easier to manage), but I'll go ahead and use the `config` instead.
@ -38,7 +26,9 @@ frontend:
image:
repository: vikunja/frontend
pullPolicy: IfNotPresent
# You can use either a `service` or an `ingress`. `Ingress` is recommended. You can make changes the service created by this chart, by overriding the values found here:
# You can use either a `service` or an `ingress` to interact with Vikunja's frontend.
# `Ingress` is the recommended option, but you can still set the `service` to
# `LoadBalancer` or another service type.
# https://github.com/bjw-s/helm-charts/blob/a081de53024d8328d1ae9ff7e4f6bc500b0f3a29/charts/library/common/values.yaml#L294-L354
service:
main:
@ -92,9 +82,25 @@ api:
config:
enabled: true
data:
database:
# You should provide your own secret outside of this helm-chart and use `postgresql.global.postgresql.auth.existingSecret` to provide credentials to the postgresql instance
# https://github.com/bjw-s/helm-charts/blob/a081de53024d8328d1ae9ff7e4f6bc500b0f3a29/charts/library/common/values.yaml#L141-L145C25
type: 'postgres'
user: "{{ .Values.postgresql.global.postgresql.auth.username }}"
password: "{{ .Values.postgresql.global.postgresql.auth.password }}"
database: "{{ .Values.postgresql.global.postgresql.auth.database }}"
host: '{{ .Release.Name }}-postgresql'
service:
# Vikunja needs to know the frontend URL for password reset emails.
frontendUrl: http://vikunja.local
typesense:
# Typesense will only work if it is enabled below (typesense.enabled).
url: '{{ printf "%s-typesense" .Release.Name }}'
apiKey: "{{ .Values.typesense.env.TYPESENSE_API_KEY }}"
redis:
# Redis will only work if it is enabled below (redis.enabled).
host: '{{ printf "%s-redis-master" .Release.Name }}'
db: "{{ .Release.Name }}"
# env:
# VIKUNJA_FRONTEND_URL: http://vikunja.local/api