Skip to content

Commit 89b1acd

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request lowcoder-org#618 from lowcoder-org/deployment_updates
fix: updated helm chart to reflect all recent changes
2 parents b20c97f + 07b1484 commit 89b1acd

File tree

10 files changed

+80
-176
lines changed

10 files changed

+80
-176
lines changed

‎deploy/docker/docker-compose-multi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ services:
5757
# - on linux/mac, generate one eg. with: head /dev/urandom | head -c 30 | shasum -a 256
5858
#
5959
LOWCODER_API_KEY_SECRET: "5a41b090758b39b226603177ef48d73ae9839dd458ccb7e66f7e7cc028d5a50b"
60+
COMMON_WORKSPACE_MODE: SAAS
6061
restart: unless-stopped
6162
depends_on:
6263
- mongodb

‎deploy/docker/docker-compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ services:
5050
# frontend parameters
5151
LOWCODER_MAX_REQUEST_SIZE: 20m
5252
LOWCODER_MAX_QUERY_TIMEOUT: 120
53+
COMMON_WORKSPACE_MODE: SAAS
5354
volumes:
5455
- ./lowcoder-stacks:/lowcoder-stacks
5556
- ./lowcoder-stacks/assets:/lowcoder/assets

‎deploy/helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Helm chart for Kubernetes for installing lowcoder
44

55
type: application
66
# Chart version (change every time you make changes to the chart)
7-
version: 0.1.0
7+
version: 1.0.0
88

99
# Lowcoder version
1010
appVersion: "latest"

‎deploy/helm/README.md

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,28 @@ $ helm delete -n lowcoder my-lowcoder
3838

3939
## Parameters
4040

41+
## Global
42+
43+
| Name | Description | Value |
44+
| --------------------------------------- | --------------------------------------------------------------------------------- | -------------- |
45+
| `global.config.workspaceMode` | Sets the workspace mode. Possible types are: SAAS, ENTERPRISE | `SAAS` |
46+
| `global.config.userId` | User ID of user running Lowcoder server application in container | `9001` |
47+
| `global.config.groupId` | Group ID of user running Lowcoder server application in container | `9001` |
48+
| `global.config.corsAllowedDomains` | CORS allowed domains | `*` |
49+
| `global.config.enableUserSignUp` | Enable users signing up to lowcoder via login page | `true` |
50+
| `global.config.encryption.password` | Encryption password - CHANGE IT! | `lowcoder.org` |
51+
| `global.config.encryption.salt` | Encryption salt - CHANGE IT! | `lowcoder.org` |
52+
| `global.config.apiKeySecret` | API-KEY secret, should be a string of at least 32 random characters - CHANGE IT | `5a41b090758b39b226603177ef48d73ae9839dd458ccb7e66f7e7cc028d5a50b` |
53+
| `global.config.maxQueryTimeout` | Maximum query timeout in seconds | `120` |
54+
| `global.config.maxRequestSize` | Maximum request size | `20m` |
55+
| `global.config.nodeServiceUrl` | URL to node-service server if using external one (disabled by default) | |
56+
| `global.config.apiServiceUrl` | URL to api-service server if using external one (disabled by default) | |
57+
| `global.defaults.maxOrgsPerUser` | Maximum allowed organizations per user | `100` |
58+
| `global.defaults.maxMembersPerOrg` | Maximum allowed members per organization | `1000` |
59+
| `global.defaults.maxGroupsPerOrg` | Maximum groups allowed per organization | `100` |
60+
| `global.defaults.maxAppsPerOrg` | Maximum allowed applications per organization | `1000` |
61+
| `global.defaults.maxDevelopers` | Maximum allowed developer accounts | `100` |
62+
4163
### Redis
4264

4365
| Name | Description | Value |
@@ -56,32 +78,3 @@ All available parameters can be found in [Bitnami Redis Chart](https://github.co
5678

5779
All available parameters can be found in [Bitnami MongoDB Chart](https://github.com/bitnami/charts/tree/main/bitnami/mongodb/#parameters)
5880

59-
### Lowcoder server api-service
60-
61-
| Name | Description | Value |
62-
| --------------------------------------- | --------------------------------------------------------------------------- | ---------------- |
63-
| `apiService.config.userId` | User ID of user running Lowcoder server application in container | `9001` |
64-
| `apiService.config.groupId` | Group ID of user running Lowcoder server application in container | `9001` |
65-
| `apiService.config.corsAllowedDomains` | CORS allowed domains | `*` |
66-
| `apiService.config.encryption.password` | Encryption password | `lowcoder.org` |
67-
| `apiService.config.encryption.salt` | Encryption salt | `lowcoder.org` |
68-
| `apiService.config.enableUserSignUp` | Enable users signing up to lowcoder via login page | `true` |
69-
| `apiService.config.nodeServiceUrl` | URL to node-service server if using external Lowcoder server | |
70-
71-
### Lowcoder server node-service
72-
73-
| Name | Description | Value |
74-
| --------------------------------------- | --------------------------------------------------------------------------- | ---------------- |
75-
| `nodeService.config.userId` | User ID of user running Lowcoder service application in container | `9001` |
76-
| `nodeService.config.groupId` | Group ID of user running Lowcoder service application in container | `9001` |
77-
| `nodeService.config.apiServiceUrl` | URL to api-service server if using external Lowcoder server | |
78-
79-
### Lowcoder frontend (client)
80-
81-
| Name | Description | Value |
82-
| --------------------------------------- | --------------------------------------------------------------------------- | ---------------- |
83-
| `frontend.config.userId` | User ID of nginx user running Lowcoder client application in container | `9001` |
84-
| `frontend.config.groupId` | Group ID of nginx user running Lowcoder client application in container | `9001` |
85-
| `frontend.config.apiServiceUrl` | URL to api-service server if using external Lowcoder server | `""` |
86-
| `frontend.config.nodeServiceUrl` | URL to node-service server if using external Lowcoder server | |
87-

‎deploy/helm/templates/api-service/configMap.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,19 @@ data:
1717
{{- else }}
1818
REDIS_URL: {{ .Values.redis.externalUrl | quote }}
1919
{{- end }}
20-
{{- if .Values.apiService.nodeServiceUrl }}
21-
LOWCODER_NODE_SERVICE_URL: {{ .Values.apiService.nodeServiceUrl | quote }}
20+
{{- if .Values.global.config.nodeServiceUrl }}
21+
LOWCODER_NODE_SERVICE_URL: {{ .Values.global.config.nodeServiceUrl | quote }}
2222
{{- else }}
2323
LOWCODER_NODE_SERVICE_URL: "http://{{ $name }}-node-service:{{ .Values.nodeService.service.port }}"
2424
{{- end }}
25-
PUID: {{ .Values.apiService.config.userId | default "9001" | quote }}
26-
PGID: {{ .Values.apiService.config.groupId | default "9001" | quote }}
27-
CORS_ALLOWED_DOMAINS: {{ .Values.apiService.config.corsAllowedDomains | default "*" | quote }}
28-
ENABLE_USER_SIGN_UP: {{ .Values.apiService.config.enableUserSignUp | default "true" | quote }}
29-
25+
PUID: {{ .Values.global.config.userId | default "9001" | quote }}
26+
PGID: {{ .Values.global.config.groupId | default "9001" | quote }}
27+
CORS_ALLOWED_DOMAINS: {{ .Values.global.config.corsAllowedDomains | default "*" | quote }}
28+
ENABLE_USER_SIGN_UP: {{ .Values.global.config.enableUserSignUp | default "true" | quote }}
29+
LOWCODER_MAX_QUERY_TIMEOUT: {{ .Values.global.config.maxQueryTimeout | default "120" | quote }}
30+
DEFAULT_ORGS_PER_USER: {{ .Values.global.defaults.maxOrgsPerUser | default "100" | quote }}
31+
DEFAULT_ORG_MEMBER_COUNT: {{ .Values.global.defaults.maxMembersPerOrg | default "1000" | quote }}
32+
DEFAULT_ORG_GROUP_COUNT: {{ .Values.global.defaults.maxGroupsPerOrg | default "100" | quote }}
33+
DEFAULT_ORG_APP_COUNT: {{ .Values.global.defaults.maxAppsPerOrg | default "1000" | quote }}
34+
DEFAULT_DEVELOPER_COUNT: {{ .Values.global.defaults.maxDevelopers | default "50" | quote }}
35+
COMMON_WORKSPACE_MODE: {{ .Values.global.config.workspaceMode | default "SAAS" | quote }}

‎deploy/helm/templates/api-service/secrets.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ stringData:
2020
{{- else }}
2121
MONGODB_URL: {{ .Values.mongodb.externalUrl | quote }}
2222
{{- end }}
23-
ENCRYPTION_PASSWORD: {{ .Values.apiService.config.encryption.password | default "lowcoder.org" | quote }}
24-
ENCRYPTION_SALT: {{ .Values.apiService.config.encryption.salt | default "lowcoder.org" | quote }}
25-
23+
ENCRYPTION_PASSWORD: {{ .Values.global.config.encryption.password | default "lowcoder.org" | quote }}
24+
ENCRYPTION_SALT: {{ .Values.global.config.encryption.salt | default "lowcoder.org" | quote }}
25+
LOWCODER_API_KEY_SECRET: "{{ .Values.global.config.apiKeySecret }}"

‎deploy/helm/templates/frontend/configMap.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@ metadata:
1111
{{- toYaml . | nindent 4 }}
1212
{{- end }}
1313
data:
14-
PUID: {{ .Values.frontend.config.userId | default "9001" | quote }}
15-
PGID: {{ .Values.frontend.config.groupId | default "9001" | quote }}
16-
{{- if .Values.frontend.config.apiServiceUrl }}
17-
LOWCODER_API_SERVICE_URL: {{ .Values.frontend.config.apiServiceUrl | trimSuffix "/" | quote }}
14+
PUID: {{ .Values.global.config.userId | default "9001" | quote }}
15+
PGID: {{ .Values.global.config.groupId | default "9001" | quote }}
16+
{{- if .Values.global.config.apiServiceUrl }}
17+
LOWCODER_API_SERVICE_URL: {{ .Values.global.config.apiServiceUrl | trimSuffix "/" | quote }}
1818
{{- else }}
1919
LOWCODER_API_SERVICE_URL: "http://{{ $name }}-api-service:{{ .Values.apiService.service.port }}"
2020
{{- end }}
21-
{{- if .Values.frontend.config.nodeServiceUrl }}
22-
LOWCODER_NODE_SERVICE_URL: {{ .Values.frontend.config.nodeServiceUrl | trimSuffix "/" | quote }}
21+
{{- if .Values.global.config.nodeServiceUrl }}
22+
LOWCODER_NODE_SERVICE_URL: {{ .Values.global.config.nodeServiceUrl | trimSuffix "/" | quote }}
2323
{{- else }}
2424
LOWCODER_NODE_SERVICE_URL: "http://{{ $name }}-node-service:{{ .Values.nodeService.service.port }}"
2525
{{- end }}
26+
LOWCODER_MAX_REQUEST_SIZE: {{ .Values.global.config.maxRequestSize | default "20m" | quote }}
27+
LOWCODER_MAX_QUERY_TIMEOUT: {{ .Values.global.config.maxQueryTimeout | default "120" | quote }}
2628

‎deploy/helm/templates/node-service/configMap.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ metadata:
1212
{{- toYaml . | nindent 4 }}
1313
{{- end }}
1414
data:
15-
PUID: {{ .Values.nodeService.config.userId | default "9001" | quote }}
16-
PGID: {{ .Values.nodeService.config.groupId | default "9001" | quote }}
17-
{{- if .Values.nodeService.apiServiceUrl }}
18-
LOWCODER_API_SERVICE_URL: {{ .Values.nodeService.apiServiceUrl | quote }}
15+
PUID: {{ .Values.global.config.userId | default "9001" | quote }}
16+
PGID: {{ .Values.global.config.groupId | default "9001" | quote }}
17+
{{- if .Values.global.config.apiServiceUrl }}
18+
LOWCODER_API_SERVICE_URL: {{ .Values.global.config.apiServiceUrl | quote }}
1919
{{- else }}
2020
LOWCODER_API_SERVICE_URL: "http://{{ $name }}-api-service:{{ .Values.apiService.service.port }}"
2121
{{- end }}

‎deploy/helm/values.yaml

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,33 @@ imagePullSecrets: []
66
nameOverride: ""
77
fullnameOverride: ""
88

9+
#
10+
# Configuration values for Lowcoder
11+
#
12+
global:
13+
config:
14+
# This setting sets workspace mode. Possible values: SAAS, ENTERPRISE
15+
workspaceMode: SAAS
16+
# ID of user and group runnning the service within the container
17+
userId: 9001
18+
groupId: 9001
19+
corsAllowedDomains: "*"
20+
enableUserSignUp: true
21+
encryption:
22+
password: "lowcoder.org"
23+
salt: "lowcoder.org"
24+
#nodeServiceUrl:
25+
#apiServiceUrl:
26+
apiKeySecret: "5a41b090758b39b226603177ef48d73ae9839dd458ccb7e66f7e7cc028d5a50b"
27+
maxQueryTimeout: 120
28+
maxRequestSize: "20m"
29+
defaults:
30+
maxOrgsPerUser: 100
31+
maxMembersPerOrg: 1000
32+
maxGroupsPerOrg: 100
33+
maxAppsPerOrg: 1000
34+
maxDevelopers: 50
35+
936
#
1037
# Redis
1138
#
@@ -59,15 +86,6 @@ apiService:
5986
# Overrides the image tag whose default is the chart appVersion.
6087
#tag: "latest"
6188

62-
config:
63-
userId: 9001
64-
groupId: 9001
65-
corsAllowedDomains: "*"
66-
enableUserSignUp: true
67-
encryption:
68-
password: "lowcoder.org"
69-
salt: "lowcoder.org"
70-
#nodeServiceUrl:
7189

7290
service:
7391
type: ClusterIP
@@ -93,10 +111,6 @@ nodeService:
93111
# Overrides the image tag whose default is the chart appVersion.
94112
#tag: "latest"
95113

96-
config:
97-
userId: 9001
98-
groupId: 9001
99-
#apiServiceUrl:
100114

101115
service:
102116
type: ClusterIP
@@ -119,12 +133,6 @@ frontend:
119133
# Overrides the image tag whose default is the chart appVersion.
120134
#tag: "latest"
121135

122-
config:
123-
userId: 9001
124-
groupId: 9001
125-
#apiServiceUrl:
126-
#nodeServiceUrl:
127-
128136
service:
129137
type: NodePort
130138
port: 80

‎yarn-error.log

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)