Merge branch 'master' into BUDI-8560/pre-refactor
This commit is contained in:
commit
c59b3c2d3c
|
@ -23,7 +23,7 @@ data:
|
|||
jwtSecret: {{ template "budibase.defaultsecret" .Values.globals.jwtSecret }}
|
||||
objectStoreAccess: {{ template "budibase.defaultsecret" .Values.services.objectStore.accessKey }}
|
||||
objectStoreSecret: {{ template "budibase.defaultsecret" .Values.services.objectStore.secretKey }}
|
||||
bbEncryptionKey: {{ template "budibase.defaultsecret" "" }}
|
||||
apiEncryptionKey: {{ template "budibase.defaultsecret" "" }}
|
||||
bbEncryptionKey: {{ template "budibase.defaultsecret" .Values.globals.bbEncryptionKey }}
|
||||
apiEncryptionKey: {{ template "budibase.defaultsecret" .Values.globals.apiEncryptionKey }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||
"version": "2.30.5",
|
||||
"version": "2.30.6",
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
"packages/*",
|
||||
|
|
Loading…
Reference in New Issue