MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ops/fix-bug-in-randomisation

This commit is contained in:
Christos Alexiou 2024-08-19 12:20:34 +03:00 committed by GitHub
parent 6bb80044e6 82c258aea6
commit 69d4f5f1ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
charts/budibase/templates/app-service-deployment.yaml
View File

@ -65,7 +65,10 @@ spec:
- name: ENABLE_ANALYTICS - name: ENABLE_ANALYTICS
value: {{ .Values.globals.enableAnalytics | quote }} value: {{ .Values.globals.enableAnalytics | quote }}
- name: API_ENCRYPTION_KEY - name: API_ENCRYPTION_KEY
value: {{ .Values.globals.apiEncryptionKey | quote }} valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: apiEncryptionKey
- name: HTTP_LOGGING - name: HTTP_LOGGING
value: {{ .Values.services.apps.httpLogging | quote }} value: {{ .Values.services.apps.httpLogging | quote }}
- name: INTERNAL_API_KEY - name: INTERNAL_API_KEY
@ -161,7 +164,10 @@ spec:
- name: TENANT_FEATURE_FLAGS - name: TENANT_FEATURE_FLAGS
value: {{ .Values.globals.tenantFeatureFlags | quote }} value: {{ .Values.globals.tenantFeatureFlags | quote }}
- name: ENCRYPTION_KEY - name: ENCRYPTION_KEY
value: {{ .Values.globals.bbEncryptionKey | quote }} valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: bbEncryptionKey
{{ if .Values.globals.bbAdminUserEmail }} {{ if .Values.globals.bbAdminUserEmail }}
- name: BB_ADMIN_USER_EMAIL - name: BB_ADMIN_USER_EMAIL
value: {{ .Values.globals.bbAdminUserEmail | quote }} value: {{ .Values.globals.bbAdminUserEmail | quote }}
@ -221,7 +227,7 @@ spec:
name: {{ .secretName }} name: {{ .secretName }}
key: {{ .secretKey | quote }} key: {{ .secretKey | quote }}
{{- end}} {{- end}}
image: budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }} image: {{ .Values.globals.dockerRegistry }}budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
imagePullPolicy: Always imagePullPolicy: Always
{{- if .Values.services.apps.startupProbe }} {{- if .Values.services.apps.startupProbe }}
{{- with .Values.services.apps.startupProbe }} {{- with .Values.services.apps.startupProbe }}

12
charts/budibase/templates/automation-worker-service-deployment.yaml
View File

@ -58,7 +58,10 @@ spec:
- name: ENABLE_ANALYTICS - name: ENABLE_ANALYTICS
value: {{ .Values.globals.enableAnalytics | quote }} value: {{ .Values.globals.enableAnalytics | quote }}
- name: API_ENCRYPTION_KEY - name: API_ENCRYPTION_KEY
value: {{ .Values.globals.apiEncryptionKey | quote }} valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: apiEncryptionKey
- name: HTTP_LOGGING - name: HTTP_LOGGING
value: {{ .Values.services.automationWorkers.httpLogging | quote }} value: {{ .Values.services.automationWorkers.httpLogging | quote }}
- name: INTERNAL_API_KEY - name: INTERNAL_API_KEY
@ -154,7 +157,10 @@ spec:
- name: TENANT_FEATURE_FLAGS - name: TENANT_FEATURE_FLAGS
value: {{ .Values.globals.tenantFeatureFlags | quote }} value: {{ .Values.globals.tenantFeatureFlags | quote }}
- name: ENCRYPTION_KEY - name: ENCRYPTION_KEY
value: {{ .Values.globals.bbEncryptionKey | quote }} valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: bbEncryptionKey
{{ if .Values.globals.bbAdminUserEmail }} {{ if .Values.globals.bbAdminUserEmail }}
- name: BB_ADMIN_USER_EMAIL - name: BB_ADMIN_USER_EMAIL
value: {{ .Values.globals.bbAdminUserEmail | quote }} value: {{ .Values.globals.bbAdminUserEmail | quote }}
@ -209,7 +215,7 @@ spec:
key: {{ .secretKey | quote }} key: {{ .secretKey | quote }}
{{- end}} {{- end}}
image: budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }} image: {{ .Values.globals.dockerRegistry }}budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
imagePullPolicy: Always imagePullPolicy: Always
{{- if .Values.services.automationWorkers.startupProbe }} {{- if .Values.services.automationWorkers.startupProbe }}
{{- with .Values.services.automationWorkers.startupProbe }} {{- with .Values.services.automationWorkers.startupProbe }}

2
charts/budibase/templates/minio-service-deployment.yaml
View File

@ -35,7 +35,7 @@ spec:
name: {{ template "budibase.fullname" . }} name: {{ template "budibase.fullname" . }}
key: objectStoreSecret key: objectStoreSecret
image: minio/minio image: {{ .Values.globals.dockerRegistry }}minio/minio
imagePullPolicy: "" imagePullPolicy: ""
livenessProbe: livenessProbe:
httpGet: httpGet:

2
charts/budibase/templates/proxy-service-deployment.yaml
View File

@ -32,7 +32,7 @@ spec:
{{ end }} {{ end }}
spec: spec:
containers: containers:
- image: budibase/proxy:{{ .Values.globals.appVersion | default .Chart.AppVersion }} - image: {{ .Values.globals.dockerRegistry }}budibase/proxy:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
imagePullPolicy: Always imagePullPolicy: Always
name: proxy-service name: proxy-service
{{- if .Values.services.proxy.startupProbe }} {{- if .Values.services.proxy.startupProbe }}

2
charts/budibase/templates/redis-service-deployment.yaml
View File

@ -22,7 +22,7 @@ spec:
- redis-server - redis-server
- --requirepass - --requirepass
- {{ .Values.services.redis.password }} - {{ .Values.services.redis.password }}
image: {{ .Values.services.redis.image }} image: {{ .Values.globals.dockerRegistry }}{{ .Values.services.redis.image }}
imagePullPolicy: "" imagePullPolicy: ""
name: redis-service name: redis-service
ports: ports:

4
charts/budibase/templates/secrets.yaml
View File

@ -16,10 +16,14 @@ data:
jwtSecret: {{ index $existingSecret.data "jwtSecret" }} jwtSecret: {{ index $existingSecret.data "jwtSecret" }}
objectStoreAccess: {{ index $existingSecret.data "objectStoreAccess" }} objectStoreAccess: {{ index $existingSecret.data "objectStoreAccess" }}
objectStoreSecret: {{ index $existingSecret.data "objectStoreSecret" }} objectStoreSecret: {{ index $existingSecret.data "objectStoreSecret" }}
bbEncryptionKey: {{ index $existingSecret.data "bbEncryptionKey" }}
apiEncryptionKey: {{ index $existingSecret.data "apiEncryptionKey" }}
{{- else }} {{- else }}
internalApiKey: {{ template "budibase.defaultsecret" .Values.globals.internalApiKey }} internalApiKey: {{ template "budibase.defaultsecret" .Values.globals.internalApiKey }}
jwtSecret: {{ template "budibase.defaultsecret" .Values.globals.jwtSecret }} jwtSecret: {{ template "budibase.defaultsecret" .Values.globals.jwtSecret }}
objectStoreAccess: {{ template "budibase.defaultsecret" .Values.services.objectStore.accessKey }} objectStoreAccess: {{ template "budibase.defaultsecret" .Values.services.objectStore.accessKey }}
objectStoreSecret: {{ template "budibase.defaultsecret" .Values.services.objectStore.secretKey }} objectStoreSecret: {{ template "budibase.defaultsecret" .Values.services.objectStore.secretKey }}
bbEncryptionKey: {{ template "budibase.defaultsecret" "" }}
apiEncryptionKey: {{ template "budibase.defaultsecret" "" }}
{{- end }} {{- end }}
{{- end }} {{- end }}

12
charts/budibase/templates/worker-service-deployment.yaml
View File

@ -65,7 +65,10 @@ spec:
{{ end }} {{ end }}
{{ end }} {{ end }}
- name: API_ENCRYPTION_KEY - name: API_ENCRYPTION_KEY
value: {{ .Values.globals.apiEncryptionKey | quote }} valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: apiEncryptionKey
- name: HTTP_LOGGING - name: HTTP_LOGGING
value: {{ .Values.services.worker.httpLogging | quote }} value: {{ .Values.services.worker.httpLogging | quote }}
- name: INTERNAL_API_KEY - name: INTERNAL_API_KEY
@ -167,7 +170,10 @@ spec:
- name: TENANT_FEATURE_FLAGS - name: TENANT_FEATURE_FLAGS
value: {{ .Values.globals.tenantFeatureFlags | quote }} value: {{ .Values.globals.tenantFeatureFlags | quote }}
- name: ENCRYPTION_KEY - name: ENCRYPTION_KEY
value: {{ .Values.globals.bbEncryptionKey | quote }} valueFrom:
secretKeyRef:
name: {{ template "budibase.fullname" . }}
key: bbEncryptionKey
{{ if .Values.globals.datadogApmEnabled }} {{ if .Values.globals.datadogApmEnabled }}
- name: DD_LOGS_INJECTION - name: DD_LOGS_INJECTION
value: {{ .Values.globals.datadogApmEnabled | quote }} value: {{ .Values.globals.datadogApmEnabled | quote }}
@ -207,7 +213,7 @@ spec:
name: {{ .secretName }} name: {{ .secretName }}
key: {{ .secretKey | quote }} key: {{ .secretKey | quote }}
{{- end}} {{- end}}
image: budibase/worker:{{ .Values.globals.appVersion | default .Chart.AppVersion }} image: {{ .Values.globals.dockerRegistry }}budibase/worker:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
imagePullPolicy: Always imagePullPolicy: Always
{{- if .Values.services.worker.startupProbe }} {{- if .Values.services.worker.startupProbe }}
{{- with .Values.services.worker.startupProbe }} {{- with .Values.services.worker.startupProbe }}

2
lerna.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "node_modules/lerna/schemas/lerna-schema.json", "$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "2.30.3", "version": "2.30.4",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",