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

Merge branch 'develop' into Cypress-Smoke

This commit is contained in:
Mitch-Budibase 2022-09-06 09:14:00 +01:00
parent 94bded075b bdd2129de2
commit 8031b3666c
20 changed files with 91 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,10 @@ spec:
name: bbapps
ports:
- containerPort: {{ .Values.services.apps.port }}
resources: {}
{{ with .Values.services.apps.resources }}
resources:
{{- toYaml . | nindent 10 }}
{{ end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}

5
charts/budibase/templates/couchdb-backup.yaml
View File

@ -38,7 +38,10 @@ spec:
image: redgeoff/replicate-couchdb-cluster
imagePullPolicy: Always
name: couchdb-backup
resources: {}
{{ with .Values.services.couchdb.backup.resources }}
resources:
{{- toYaml . | nindent 10 }}
{{ end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}

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

@ -56,7 +56,10 @@ spec:
name: minio-service
ports:
- containerPort: {{ .Values.services.objectStore.port }}
resources: {}
{{ with .Values.services.objectStore.resources }}
resources:
{{- toYaml . | nindent 10 }}
{{ end }}
volumeMounts:
- mountPath: /data
name: minio-data

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

@ -30,7 +30,10 @@ spec:
name: proxy-service
ports:
- containerPort: {{ .Values.services.proxy.port }}
resources: {}
{{ with .Values.services.proxy.resources }}
resources:
{{- toYaml . | nindent 10 }}
{{ end }}
volumeMounts:
{{- with .Values.affinity }}
affinity:

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

@ -35,7 +35,10 @@ spec:
name: redis-service
ports:
- containerPort: {{ .Values.services.redis.port }}
resources: {}
{{ with .Values.services.redis.resources }}
resources:
{{- toYaml . | nindent 10 }}
{{ end }}
volumeMounts:
- mountPath: /data
name: redis-data

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

@ -151,7 +151,10 @@ spec:
name: bbworker
ports:
- containerPort: {{ .Values.services.worker.port }}
resources: {}
{{ with .Values.services.worker.resources }}
resources:
{{- toYaml . | nindent 10 }}
{{ end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}

19
charts/budibase/values.yaml
View File

@ -60,19 +60,6 @@ ingress:
port:
number: 10000
resources:
{}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
autoscaling:
enabled: false
minReplicas: 1
@ -125,16 +112,19 @@ services:
proxy:
port: 10000
replicaCount: 1
resources: {}
apps:
port: 4002
replicaCount: 1
logLevel: info
resources: {}
# nodeDebug: "" # set the value of NODE_DEBUG
worker:
port: 4003
replicaCount: 1
resources: {}
couchdb:
enabled: true
@ -148,6 +138,7 @@ services:
target: ""
# backup interval in seconds
interval: ""
resources: {}
redis:
enabled: true # disable if using external redis
@ -161,6 +152,7 @@ services:
## If undefined (the default) or set to null, no storageClassName spec is
## set, choosing the default provisioner.
storageClass: ""
resources: {}
objectStore:
minio: true
@ -177,6 +169,7 @@ services:
## If undefined (the default) or set to null, no storageClassName spec is
## set, choosing the default provisioner.
storageClass: ""
resources: {}
# Override values in couchDB subchart
couchdb:

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"npmClient": "yarn",
"packages": [
"packages/*"

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/types": "1.3.4-alpha.1",
"@budibase/types": "1.3.4-alpha.3",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",
"bcrypt": "5.0.1",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "1.3.4-alpha.1",
"@budibase/string-templates": "1.3.4-alpha.3",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -69,10 +69,10 @@
}
},
"dependencies": {
"@budibase/bbui": "1.3.4-alpha.1",
"@budibase/client": "1.3.4-alpha.1",
"@budibase/frontend-core": "1.3.4-alpha.1",
"@budibase/string-templates": "1.3.4-alpha.1",
"@budibase/bbui": "1.3.4-alpha.3",
"@budibase/client": "1.3.4-alpha.3",
"@budibase/frontend-core": "1.3.4-alpha.3",
"@budibase/string-templates": "1.3.4-alpha.3",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

4
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,7 +26,7 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "1.3.4-alpha.1",
"@budibase/backend-core": "1.3.4-alpha.3",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "1.3.4-alpha.1",
"@budibase/frontend-core": "1.3.4-alpha.1",
"@budibase/string-templates": "1.3.4-alpha.1",
"@budibase/bbui": "1.3.4-alpha.3",
"@budibase/frontend-core": "1.3.4-alpha.3",
"@budibase/string-templates": "1.3.4-alpha.3",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "1.3.4-alpha.1",
"@budibase/bbui": "1.3.4-alpha.3",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "1.3.4-alpha.1",
"@budibase/client": "1.3.4-alpha.1",
"@budibase/pro": "1.3.4-alpha.1",
"@budibase/string-templates": "1.3.4-alpha.1",
"@budibase/types": "1.3.4-alpha.1",
"@budibase/backend-core": "1.3.4-alpha.3",
"@budibase/client": "1.3.4-alpha.3",
"@budibase/pro": "1.3.4-alpha.3",
"@budibase/string-templates": "1.3.4-alpha.3",
"@budibase/types": "1.3.4-alpha.3",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

30
packages/server/yarn.lock
View File

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.3.4-alpha.1":
version "1.3.4-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.4-alpha.1.tgz#5c7547bdf22da936ab6fea8c5fc3ad1b9d54a910"
integrity sha512-TH4AyFm31kduVYdciw0TLhkGbilSi6vtE2h0qbnr5QV8SszZ8iKt3vUljTHS0PsH2V/S7qLQVEqZ2blkpRHO0A==
"@budibase/backend-core@1.3.4-alpha.3":
version "1.3.4-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.4-alpha.3.tgz#2adcd2e111287ffd91a964325f59c8b904b158ae"
integrity sha512-CBlpSQODyG7qGH5jIQlRchQ6xWRTi2B+2eD2IoeI9j2duoNKPxkpvGAzh0NaFEwfmShSfNrC/yrr4YKkMnV3/g==
dependencies:
"@budibase/types" "1.3.4-alpha.1"
"@budibase/types" "1.3.4-alpha.3"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -1178,13 +1178,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.3.4-alpha.1":
version "1.3.4-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.4-alpha.1.tgz#fa58c6a0e58d620ddd329389ae896b823a4dd50e"
integrity sha512-e8dReYYw+weqYYAQC0zkatBgACaXcbM71kneUTYaX7DnYg7WGY3EHyfajjlQXq+gxmVuXc6wkY28dIozG+/8TQ==
"@budibase/pro@1.3.4-alpha.3":
version "1.3.4-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.4-alpha.3.tgz#64d46b83ee658635ae32441e3ed97b2902de5286"
integrity sha512-SYmaTMIXDJSRZLXKQrtLEmIeigrL6biiVizDXqo4FbJgNIQg0UVdVP7mTO3sEg1VCbqEB89DEZ1tTaPgmKmgSA==
dependencies:
"@budibase/backend-core" "1.3.4-alpha.1"
"@budibase/types" "1.3.4-alpha.1"
"@budibase/backend-core" "1.3.4-alpha.3"
"@budibase/types" "1.3.4-alpha.3"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1207,10 +1207,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@1.3.4-alpha.1":
version "1.3.4-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.4-alpha.1.tgz#e75aaf70b5c5a3e7b9fde6f77cb91447dffe0d2d"
integrity sha512-DpjO3bkPiOCDtIsvPWU4p6SGBAsN80vtr7zz3Cjrv7p98050fWzkUBPAISOTCWTq59OpF6dUhmMmOQuN6OrK+g==
"@budibase/types@1.3.4-alpha.3":
version "1.3.4-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.4-alpha.3.tgz#198d00ea7cdc4393044c07ee301f176f0b391378"
integrity sha512-ThpEPNC2vQunqJ6G2avwCqh3zr6Lo28G5CEJUBNrUpnAyJ/Pvw0DPU6shN9loVxR3fmGtWKoU0sA/mapH8QWCg==
"@bull-board/api@3.7.0":
version "3.7.0"

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.3.4-alpha.1",
"version": "1.3.4-alpha.3",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -35,10 +35,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "1.3.4-alpha.1",
"@budibase/pro": "1.3.4-alpha.1",
"@budibase/string-templates": "1.3.4-alpha.1",
"@budibase/types": "1.3.4-alpha.1",
"@budibase/backend-core": "1.3.4-alpha.3",
"@budibase/pro": "1.3.4-alpha.3",
"@budibase/string-templates": "1.3.4-alpha.3",
"@budibase/types": "1.3.4-alpha.3",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

30
packages/worker/yarn.lock
View File

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.3.4-alpha.1":
version "1.3.4-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.4-alpha.1.tgz#5c7547bdf22da936ab6fea8c5fc3ad1b9d54a910"
integrity sha512-TH4AyFm31kduVYdciw0TLhkGbilSi6vtE2h0qbnr5QV8SszZ8iKt3vUljTHS0PsH2V/S7qLQVEqZ2blkpRHO0A==
"@budibase/backend-core@1.3.4-alpha.3":
version "1.3.4-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.4-alpha.3.tgz#2adcd2e111287ffd91a964325f59c8b904b158ae"
integrity sha512-CBlpSQODyG7qGH5jIQlRchQ6xWRTi2B+2eD2IoeI9j2duoNKPxkpvGAzh0NaFEwfmShSfNrC/yrr4YKkMnV3/g==
dependencies:
"@budibase/types" "1.3.4-alpha.1"
"@budibase/types" "1.3.4-alpha.3"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -325,21 +325,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@1.3.4-alpha.1":
version "1.3.4-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.4-alpha.1.tgz#fa58c6a0e58d620ddd329389ae896b823a4dd50e"
integrity sha512-e8dReYYw+weqYYAQC0zkatBgACaXcbM71kneUTYaX7DnYg7WGY3EHyfajjlQXq+gxmVuXc6wkY28dIozG+/8TQ==
"@budibase/pro@1.3.4-alpha.3":
version "1.3.4-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.4-alpha.3.tgz#64d46b83ee658635ae32441e3ed97b2902de5286"
integrity sha512-SYmaTMIXDJSRZLXKQrtLEmIeigrL6biiVizDXqo4FbJgNIQg0UVdVP7mTO3sEg1VCbqEB89DEZ1tTaPgmKmgSA==
dependencies:
"@budibase/backend-core" "1.3.4-alpha.1"
"@budibase/types" "1.3.4-alpha.1"
"@budibase/backend-core" "1.3.4-alpha.3"
"@budibase/types" "1.3.4-alpha.3"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.3.4-alpha.1":
version "1.3.4-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.4-alpha.1.tgz#e75aaf70b5c5a3e7b9fde6f77cb91447dffe0d2d"
integrity sha512-DpjO3bkPiOCDtIsvPWU4p6SGBAsN80vtr7zz3Cjrv7p98050fWzkUBPAISOTCWTq59OpF6dUhmMmOQuN6OrK+g==
"@budibase/types@1.3.4-alpha.3":
version "1.3.4-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.4-alpha.3.tgz#198d00ea7cdc4393044c07ee301f176f0b391378"
integrity sha512-ThpEPNC2vQunqJ6G2avwCqh3zr6Lo28G5CEJUBNrUpnAyJ/Pvw0DPU6shN9loVxR3fmGtWKoU0sA/mapH8QWCg==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"