totally generic templates complete, pending test in different clouds

This commit is contained in:
Martin McKeaveney 2021-08-16 19:00:08 +01:00
parent 0d6b0c887b
commit 1b78d8349f
3 changed files with 48 additions and 11 deletions

View File

@ -29,8 +29,22 @@ spec:
- name: BUDIBASE_ENVIRONMENT - name: BUDIBASE_ENVIRONMENT
value: {{ .Values.globals.budibaseEnv }} value: {{ .Values.globals.budibaseEnv }}
- name: COUCH_DB_URL - name: COUCH_DB_URL
# Or inject value directly {{ if .Values.services.couchdb.url }}
value: couchdb-service.{{ include "budibase.serviceDns" . }}:{{ .Values.services.couchdb.port }} value: {{ .Values.services.couchdb.url }}
{{ else }}
# value: http://{{ .Release.Name }}-svc-couchdb.{{ include "budibase.serviceDns" . }}:{{ .Values.services.couchdb.port }}
value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }}
{{ end }}
- name: COUCH_DB_USER
valueFrom:
secretKeyRef:
name: {{ template "couchdb.fullname" . }}
key: adminUsername
- name: COUCH_DB_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "couchdb.fullname" . }}
key: adminPassword
- name: ENABLE_ANALYTICS - name: ENABLE_ANALYTICS
value: {{ .Values.globals.enableAnalytics | quote }} value: {{ .Values.globals.enableAnalytics | quote }}
- name: INTERNAL_API_KEY - name: INTERNAL_API_KEY
@ -56,21 +70,27 @@ spec:
name: {{ template "budibase.fullname" . }} name: {{ template "budibase.fullname" . }}
key: objectStoreSecret key: objectStoreSecret
- name: MINIO_URL - name: MINIO_URL
# Or inject value directly {{ if .Values.services.objectStore.url }}
value: minio-service.{{ include "budibase.serviceDns" . }}{{ .Values.services.objectStore.port }} value: {{ .Values.services.objectStore.url }}
{{ else }}
value: http://minio-service:{{ .Values.services.objectStore.port }}
{{ end }}
- name: PORT - name: PORT
value: {{ .Values.services.apps.port | quote }} value: {{ .Values.services.apps.port | quote }}
- name: REDIS_PASSWORD - name: REDIS_PASSWORD
value: {{ .Values.services.redis.password }} value: {{ .Values.services.redis.password }}
- name: REDIS_URL - name: REDIS_URL
# Or inject value directly {{ if .Values.services.redis.url }}
value: redis-service.{{ include "budibase.serviceDns" . }}:{{ .Values.services.redis.port }} value: {{ .Values.services.redis.url }}
{{ else }}
value: redis-service:{{ .Values.services.redis.port }}
{{ end }}
- name: SELF_HOSTED - name: SELF_HOSTED
value: {{ .Values.globals.selfHosted | quote }} value: {{ .Values.globals.selfHosted | quote }}
- name: SENTRY_DSN - name: SENTRY_DSN
value: {{ .Values.globals.sentryDSN }} value: {{ .Values.globals.sentryDSN }}
- name: WORKER_URL - name: WORKER_URL
value: worker-service.{{ include "budibase.serviceDns" . }}:{{ .Values.services.worker.port }} value: worker-service:{{ .Values.services.worker.port }}
image: budibase/apps image: budibase/apps
imagePullPolicy: Always imagePullPolicy: Always
name: bbapps name: bbapps

View File

@ -34,13 +34,22 @@ spec:
secretKeyRef: secretKeyRef:
name: {{ template "couchdb.fullname" . }} name: {{ template "couchdb.fullname" . }}
key: adminUsername key: adminUsername
- name: COUCH_DB_USER
valueFrom:
secretKeyRef:
name: {{ template "couchdb.fullname" . }}
key: adminUsername
- name: COUCH_DB_PASSWORD - name: COUCH_DB_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ template "couchdb.fullname" . }} name: {{ template "couchdb.fullname" . }}
key: adminPassword key: adminPassword
- name: COUCH_DB_URL - name: COUCH_DB_URL
value: http://couchdb-service.{{ include "budibase.serviceDns" . }}:{{ .Values.services.couchdb.port }} {{ if .Values.services.couchdb.url }}
value: {{ .Values.services.couchdb.url }}
{{ else }}
value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }}
{{ end }}
- name: INTERNAL_API_KEY - name: INTERNAL_API_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
@ -62,13 +71,21 @@ spec:
name: {{ template "budibase.fullname" . }} name: {{ template "budibase.fullname" . }}
key: objectStoreSecret key: objectStoreSecret
- name: MINIO_URL - name: MINIO_URL
value: minio-service.{{ include "budibase.serviceDns" . }}{{ .Values.services.objectStore.port }} {{ if .Values.services.objectStore.url }}
value: {{ .Values.services.objectStore.url }}
{{ else }}
value: http://minio-service:{{ .Values.services.objectStore.port }}
{{ end }}
- name: PORT - name: PORT
value: {{ .Values.services.worker.port | quote }} value: {{ .Values.services.worker.port | quote }}
- name: REDIS_PASSWORD - name: REDIS_PASSWORD
value: {{ .Values.services.redis.password | quote }} value: {{ .Values.services.redis.password | quote }}
- name: REDIS_URL - name: REDIS_URL
value: redis-service.{{ include "budibase.serviceDns" . }}{{ .Values.services.redis.port }} {{ if .Values.services.redis.url }}
value: {{ .Values.services.redis.url }}
{{ else }}
value: redis-service:{{ .Values.services.redis.port }}
{{ end }}
- name: SELF_HOSTED - name: SELF_HOSTED
value: {{ .Values.globals.selfHosted | quote }} value: {{ .Values.globals.selfHosted | quote }}
image: budibase/worker image: budibase/worker

View File

@ -119,7 +119,7 @@ services:
url: "" # only change if pointing to existing couch server url: "" # only change if pointing to existing couch server
user: "" # only change if pointing to existing couch server user: "" # only change if pointing to existing couch server
password: "" # only change if pointing to existing couch server password: "" # only change if pointing to existing couch server
port: 5678 port: 5984
storage: 100Mi storage: 100Mi
redis: redis: