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
3 changed files with 12 additions and 17 deletions
Showing only changes of commit f45e1eca70 - Show all commits

View File

@ -15,13 +15,13 @@ appVersion: 0.21.0
kubeVersion: ">= 1.19"
dependencies:
- name: redis
version: 17.5.1
repository: https://charts.bitnami.com/bitnami
condition: redisEnabled
version: 17.11.6
condition: redis.enabled
- name: postgresql
version: 12.1.9
repository: https://charts.bitnami.com/bitnami
condition: postgresqlEnabled
condition: postgresql.enabled
- name: common
repository: https://bjw-s.github.io/helm-charts
version: 1.5.1

View File

@ -14,6 +14,14 @@ service:
port: 3456
protocol: HTTP
env:
{{ if .Values.typesense.enabled }}
VIKUNJA_TYPESENSE_ENABLED: {{ .Values.typesense.apiKey }}
VIKUNJA_TYPESENSE_URL: {{ .Values.typesense.host }}
VIKUNJA_TYPESENSE_APIKEY: {{ .Values.typesense.apiKey }}
{{ end }}
{{ end }}

View File

@ -4,19 +4,6 @@
# These entries are shared between all the vikunja components
env:
REDIS_HOSTNAME: '{{ printf "%s-redis-master" .Release.Name }}'
DB_HOSTNAME: "{{ .Release.Name }}-postgresql"
DB_USERNAME: "{{ .Values.postgresql.global.postgresql.auth.username }}"
DB_DATABASE_NAME: "{{ .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
DB_PASSWORD: "{{ .Values.postgresql.global.postgresql.auth.password }}"
TYPESENSE_ENABLED: "{{ .Values.typesense.enabled }}"
TYPESENSE_API_KEY: "{{ .Values.typesense.env.TYPESENSE_API_KEY }}"
TYPESENSE_HOST: '{{ printf "%s-typesense" .Release.Name }}'
VIKUNJA_FRONTEND_URL: '{{ printf "http://%s-web:3000" .Release.Name }}'
VIKUNJA_API_URL: '{{ printf "http://%s-server:3001" .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.
@ -46,7 +33,7 @@ frontend:
tls: []
backend:
enabled: false
enabled: true
image:
repository: vikunja/api
pullPolicy: IfNotPresent