working api configmap
This commit is contained in:
parent
f7731a71f6
commit
ca27726852
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,2 +1,3 @@
|
||||||
charts/*.tgz
|
charts/*.tgz
|
||||||
*.tgz
|
*.tgz
|
||||||
|
output.yaml
|
||||||
|
|
|
@ -14,6 +14,14 @@ service:
|
||||||
port: 3456
|
port: 3456
|
||||||
protocol: HTTP
|
protocol: HTTP
|
||||||
|
|
||||||
|
persistence:
|
||||||
|
config:
|
||||||
|
enabled: true
|
||||||
|
type: configMap
|
||||||
|
name: "{{ .Release.Name }}-api-config"
|
||||||
|
mountPath: /etc/vikunja/config.yml
|
||||||
|
subPath: config.yml
|
||||||
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
{{ if .Values.redis.enabled }}
|
{{ if .Values.redis.enabled }}
|
||||||
|
@ -24,16 +32,12 @@ env:
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
# Logic to decide what the api URL should be
|
# Logic to decide what the api URL should be
|
||||||
{{ if .Values.ingress.enabled }}
|
{{ if .Values.frontend.ingress.enabled }}
|
||||||
VIKUNJA_API_URL: "https://{{ .Values.ingress.host }}{{ .Values.ingress.path }}"
|
VIKUNJA_FRONTEND_URL: "http://{{ index .Values.frontend.ingress.main.hosts 0 "host" }}{{ index .Values.frontend.ingress.main.hosts 0 "path" }}"
|
||||||
{{ else if .Values.service.main.enabled }}
|
{{ end }}
|
||||||
VIKUNJA_API_URL: "http://{{ .Values.service.main.name }}.{{ .Values.service.main.namespace }}.svc.cluster.local:{{ .Values.service.main.ports.http.port }}{{ .Values.ingress.path }}"
|
|
||||||
{{ else }}
|
|
||||||
VIKUNJA_API_URL: "http://localhost:3456{{ .Values.ingress.path }}"
|
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
|
||||||
{{ end }}
|
|
||||||
|
|
||||||
{{ if .Values.api.enabled }}
|
{{ if .Values.api.enabled }}
|
||||||
{{- $ctx := deepCopy . -}}
|
{{- $ctx := deepCopy . -}}
|
29
values.yaml
29
values.yaml
|
@ -15,8 +15,6 @@ env:
|
||||||
VIKUNJA_DATABASE_PASSWORD: "{{ .Values.postgresql.global.postgresql.auth.password }}"
|
VIKUNJA_DATABASE_PASSWORD: "{{ .Values.postgresql.global.postgresql.auth.password }}"
|
||||||
VIKUNJA_TYPESENSE_APIKEY: "{{ .Values.typesense.env.TYPESENSE_API_KEY }}"
|
VIKUNJA_TYPESENSE_APIKEY: "{{ .Values.typesense.env.TYPESENSE_API_KEY }}"
|
||||||
VIKUNJA_TYPESENSE_URL: '{{ printf "%s-typesense" .Release.Name }}'
|
VIKUNJA_TYPESENSE_URL: '{{ printf "%s-typesense" .Release.Name }}'
|
||||||
VIKUNJA_FRONTEND_URL: '{{ printf "http://%s-frontend" .Release.Name }}'
|
|
||||||
VIKUNJA_API_URL: '{{ .Values.backened.ingress.main.hosts[0].host }}'
|
|
||||||
|
|
||||||
image:
|
image:
|
||||||
tag: 0.21.0
|
tag: 0.21.0
|
||||||
|
@ -31,12 +29,21 @@ storage:
|
||||||
######################
|
######################
|
||||||
# VIKUNJA COMPONENTS #
|
# VIKUNJA COMPONENTS #
|
||||||
######################
|
######################
|
||||||
|
# You can find the default values
|
||||||
frontend:
|
frontend:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
# You can add any of the top-level keys in the common chart's `values.yaml` to override them here.
|
||||||
|
# For example, this values.yaml file overrides the image values, located here:
|
||||||
# https://github.com/bjw-s/helm-charts/blob/a081de53024d8328d1ae9ff7e4f6bc500b0f3a29/charts/library/common/values.yaml#L63-L69
|
# https://github.com/bjw-s/helm-charts/blob/a081de53024d8328d1ae9ff7e4f6bc500b0f3a29/charts/library/common/values.yaml#L63-L69
|
||||||
image:
|
image:
|
||||||
repository: vikunja/frontend
|
repository: vikunja/frontend
|
||||||
pullPolicy: IfNotPresent
|
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:
|
||||||
|
# https://github.com/bjw-s/helm-charts/blob/a081de53024d8328d1ae9ff7e4f6bc500b0f3a29/charts/library/common/values.yaml#L294-L354
|
||||||
|
service:
|
||||||
|
main:
|
||||||
|
type: ClusterIP
|
||||||
|
|
||||||
# https://github.com/bjw-s/helm-charts/blob/a081de53024d8328d1ae9ff7e4f6bc500b0f3a29/charts/library/common/values.yaml#L393-L436
|
# https://github.com/bjw-s/helm-charts/blob/a081de53024d8328d1ae9ff7e4f6bc500b0f3a29/charts/library/common/values.yaml#L393-L436
|
||||||
ingress:
|
ingress:
|
||||||
main:
|
main:
|
||||||
|
@ -49,6 +56,12 @@ frontend:
|
||||||
paths:
|
paths:
|
||||||
- path: "/"
|
- path: "/"
|
||||||
tls: []
|
tls: []
|
||||||
|
configMaps:
|
||||||
|
# The configuration for Vikunja's frontend.
|
||||||
|
# https://vikunja.io/docs/config-options/
|
||||||
|
config:
|
||||||
|
enabled: true
|
||||||
|
data: {}
|
||||||
|
|
||||||
api:
|
api:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
@ -73,6 +86,18 @@ api:
|
||||||
paths:
|
paths:
|
||||||
- path: "/api"
|
- path: "/api"
|
||||||
tls: []
|
tls: []
|
||||||
|
configMaps:
|
||||||
|
# The configuration for Vikunja's backend.
|
||||||
|
# https://vikunja.io/docs/config-options/
|
||||||
|
config:
|
||||||
|
enabled: true
|
||||||
|
data:
|
||||||
|
service:
|
||||||
|
# Vikunja needs to know the frontend URL for password reset emails.
|
||||||
|
frontendUrl: http://vikunja.local
|
||||||
|
|
||||||
|
# env:
|
||||||
|
# VIKUNJA_FRONTEND_URL: http://vikunja.local/api
|
||||||
|
|
||||||
##########################
|
##########################
|
||||||
# END VIKUNJA COMPONENTS #
|
# END VIKUNJA COMPONENTS #
|
||||||
|
|
Loading…
Reference in New Issue
Block a user