From 03a7dd2b596e1d0cceed1a07f0637c05ad49197f Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 31 May 2024 14:32:26 +0100 Subject: [PATCH 1/4] Add SQS params to Helm chart. --- .../budibase/templates/app-service-deployment.yaml | 12 ++++++++++++ .../templates/worker-service-deployment.yaml | 12 ++++++++++++ charts/budibase/values.yaml | 9 +++++++++ 3 files changed, 33 insertions(+) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index ed7166ec5d..f399fcb8b6 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -42,6 +42,14 @@ spec: {{ else }} value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }} {{ end }} + {{ if .Values.globals.sqs.enabled }} + - name: COUCH_DB_SQL_URL + {{ if .Values.globals.sqs.url }} + value: {{ .Values.globals.sqs.url }} + {{ else }} + value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.globals.sqs.port }} + {{ end }} + {{ end }} {{ if .Values.services.couchdb.enabled }} - name: COUCH_DB_USER valueFrom: @@ -198,6 +206,10 @@ spec: - name: APP_FEATURES value: "api" {{- end }} + {{- if .Values.globals.sqs.enabled }} + - name: SQS_SEARCH_ENABLE + value: "true" + {{- end }} {{- range .Values.services.apps.extraEnv }} - name: {{ .name }} value: {{ .value | quote }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index 66a9bb6c14..38edfa21c0 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -56,6 +56,14 @@ spec: {{ else }} value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }} {{ end }} + {{ if .Values.globals.sqs.enabled }} + - name: COUCH_DB_SQL_URL + {{ if .Values.globals.sqs.url }} + value: {{ .Values.globals.sqs.url }} + {{ else }} + value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.globals.sqs.port }} + {{ end }} + {{ end }} - name: API_ENCRYPTION_KEY value: {{ .Values.globals.apiEncryptionKey | quote }} - name: HTTP_LOGGING @@ -184,6 +192,10 @@ spec: - name: NODE_TLS_REJECT_UNAUTHORIZED value: {{ .Values.services.tlsRejectUnauthorized }} {{ end }} + {{- if .Values.globals.sqs.enabled }} + - name: SQS_SEARCH_ENABLE + value: "true" + {{- end }} {{- range .Values.services.worker.extraEnv }} - name: {{ .name }} value: {{ .value | quote }} diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 27037cdaa8..2069a2540d 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -138,6 +138,15 @@ globals: # -- The password to use when authenticating with your SMTP server. password: "" + sqs: + # -- Whether to use the CouchDB "structure query service" or not. This is disabled by + # default for now, but will become the default in a future release. + enabled: false + # @ignore + url: "" + # @ignore + port: "4984" + services: # -- The DNS suffix to use for service discovery. You only need to change this # if you've configured your cluster to use a different DNS suffix. From 595e518df0aceab80d394090fea6a0ccd5acdac9 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 4 Jun 2024 14:32:34 +0100 Subject: [PATCH 2/4] Update CouchDB chart from 4.3.0 to 4.5.5. --- charts/budibase/Chart.lock | 6 +++--- charts/budibase/Chart.yaml | 2 +- charts/budibase/charts/couchdb-4.3.0.tgz | Bin 14629 -> 0 bytes charts/budibase/charts/couchdb-4.5.5.tgz | Bin 0 -> 15743 bytes charts/budibase/values.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 charts/budibase/charts/couchdb-4.3.0.tgz create mode 100644 charts/budibase/charts/couchdb-4.5.5.tgz diff --git a/charts/budibase/Chart.lock b/charts/budibase/Chart.lock index 3ee752a362..2a59452971 100644 --- a/charts/budibase/Chart.lock +++ b/charts/budibase/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: couchdb repository: https://apache.github.io/couchdb-helm - version: 4.3.0 -digest: sha256:94449a7f195b186f5af33ec5aa66d58b36bede240fae710f021ca87837b30606 -generated: "2023-11-20T17:43:02.777596Z" + version: 4.5.5 +digest: sha256:bbbf022c77105c43b735539de05fe69e4c9de51581a0e245b3553030d5e44fa9 +generated: "2024-06-04T10:42:00.640809+01:00" diff --git a/charts/budibase/Chart.yaml b/charts/budibase/Chart.yaml index 83a72d203f..e0403f90d6 100644 --- a/charts/budibase/Chart.yaml +++ b/charts/budibase/Chart.yaml @@ -17,6 +17,6 @@ version: 0.0.0 appVersion: 0.0.0 dependencies: - name: couchdb - version: 4.5.3 + version: 4.5.5 repository: https://apache.github.io/couchdb-helm condition: services.couchdb.enabled diff --git a/charts/budibase/charts/couchdb-4.3.0.tgz b/charts/budibase/charts/couchdb-4.3.0.tgz deleted file mode 100644 index d3cce28ee630a20d8bdc0051746b6e2dac95f7fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14629 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 Date: Wed, 5 Jun 2024 15:13:39 +0100 Subject: [PATCH 3/4] Get SQS working in the Helm chart. --- charts/budibase/Chart.lock | 6 +++--- charts/budibase/Chart.yaml | 2 +- charts/budibase/charts/couchdb-4.5.5.tgz | Bin 15743 -> 0 bytes charts/budibase/charts/couchdb-4.5.6.tgz | Bin 0 -> 15786 bytes charts/budibase/values.yaml | 15 +++++++++++++++ 5 files changed, 19 insertions(+), 4 deletions(-) delete mode 100644 charts/budibase/charts/couchdb-4.5.5.tgz create mode 100644 charts/budibase/charts/couchdb-4.5.6.tgz diff --git a/charts/budibase/Chart.lock b/charts/budibase/Chart.lock index 2a59452971..8ff1d36941 100644 --- a/charts/budibase/Chart.lock +++ b/charts/budibase/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: couchdb repository: https://apache.github.io/couchdb-helm - version: 4.5.5 -digest: sha256:bbbf022c77105c43b735539de05fe69e4c9de51581a0e245b3553030d5e44fa9 -generated: "2024-06-04T10:42:00.640809+01:00" + version: 4.5.6 +digest: sha256:405f098633e632d6f4e140175f156ed4f02918b0d89193f1b66c9cbea211d6c9 +generated: "2024-06-05T14:41:05.979052+01:00" diff --git a/charts/budibase/Chart.yaml b/charts/budibase/Chart.yaml index e0403f90d6..a16eba8982 100644 --- a/charts/budibase/Chart.yaml +++ b/charts/budibase/Chart.yaml @@ -17,6 +17,6 @@ version: 0.0.0 appVersion: 0.0.0 dependencies: - name: couchdb - version: 4.5.5 + version: 4.5.6 repository: https://apache.github.io/couchdb-helm condition: services.couchdb.enabled diff --git a/charts/budibase/charts/couchdb-4.5.5.tgz b/charts/budibase/charts/couchdb-4.5.5.tgz deleted file mode 100644 index aba7f07cbbdbecc3bfee932489ed727d8800525f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15743 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 JFn4gU{{t11Wq1Gp literal 0 HcmV?d00001 diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 2995d0fe7e..58bd889857 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -645,6 +645,21 @@ couchdb: # @ignore pullPolicy: Always + extraPorts: + # -- Extra ports to expose on the CouchDB service. We expose the SQS port + # by default, but you can add more ports here if you need to. + - name: sqs + containerPort: 4984 + + service: + extraPorts: + # -- Extra ports to expose on the CouchDB service. We expose the SQS port + # by default, but you can add more ports here if you need to. + - name: sqs + port: 4984 + targetPort: 4984 + protocol: TCP + # @ignore # This should remain false. We ship Clouseau ourselves as part of the # budibase/couchdb image, and it's not possible to disable it because it's a From 91c09e70fdee18780d5bc18cd5673f752361b267 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 5 Jun 2024 15:13:59 +0100 Subject: [PATCH 4/4] Run helm-docs --- charts/budibase/README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/budibase/README.md b/charts/budibase/README.md index 207992087d..c944ed1397 100644 --- a/charts/budibase/README.md +++ b/charts/budibase/README.md @@ -112,7 +112,9 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml | awsAlbIngress.enabled | bool | `false` | Whether to create an ALB Ingress resource pointing to the Budibase proxy. Requires the AWS ALB Ingress Controller. | | couchdb.clusterSize | int | `1` | The number of replicas to run in the CouchDB cluster. We set this to 1 by default to make things simpler, but you can set it to 3 if you need a high-availability CouchDB cluster. | | couchdb.couchdbConfig.couchdb.uuid | string | `"budibase-couchdb"` | Unique identifier for this CouchDB server instance. You shouldn't need to change this. | +| couchdb.extraPorts[0] | object | `{"containerPort":4984,"name":"sqs"}` | Extra ports to expose on the CouchDB service. We expose the SQS port by default, but you can add more ports here if you need to. | | couchdb.image | object | `{}` | We use a custom CouchDB image for running Budibase and we don't support using any other CouchDB image. You shouldn't change this, and if you do we can't guarantee that Budibase will work. | +| couchdb.service.extraPorts[0] | object | `{"name":"sqs","port":4984,"protocol":"TCP","targetPort":4984}` | Extra ports to expose on the CouchDB service. We expose the SQS port by default, but you can add more ports here if you need to. | | globals.apiEncryptionKey | string | `""` | Used for encrypting API keys and environment variables when stored in the database. You don't need to set this if `createSecrets` is true. | | globals.appVersion | string | `""` | The version of Budibase to deploy. Defaults to what's specified by {{ .Chart.AppVersion }}. Ends up being used as the image version tag for the apps, proxy, and worker images. | | globals.automationMaxIterations | string | `"200"` | The maximum number of iterations allows for an automation loop step. You can read more about looping here: . | @@ -135,6 +137,8 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml | globals.smtp.password | string | `""` | The password to use when authenticating with your SMTP server. | | globals.smtp.port | string | `"587"` | The port of your SMTP server. | | globals.smtp.user | string | `""` | The username to use when authenticating with your SMTP server. | +| globals.sqs.enabled | bool | `false` | Whether to use the CouchDB "structured query service" or not. This is disabled by default for now, but will become the default in a future release. | +| globals.tempBucketName | string | `""` | | | globals.tenantFeatureFlags | string | `"*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR"` | Sets what feature flags are enabled and for which tenants. Should not ordinarily need to be changed. | | imagePullSecrets | list | `[]` | Passed to all pods created by this chart. Should not ordinarily need to be changed. | | ingress.className | string | `""` | What ingress class to use. | @@ -152,6 +156,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml | services.apps.autoscaling.targetCPUUtilizationPercentage | int | `80` | Target CPU utilization percentage for the apps service. Note that for autoscaling to work, you will need to have metrics-server configured, and resources set for the apps pods. | | services.apps.extraContainers | list | `[]` | Additional containers to be added to the apps pod. | | services.apps.extraEnv | list | `[]` | Extra environment variables to set for apps pods. Takes a list of name=value pairs. | +| services.apps.extraEnvFromSecret | list | `[]` | Name of the K8s Secret in the same namespace which contains the extra environment variables. This can be used to avoid storing sensitive information in the values.yaml file. | | services.apps.extraVolumeMounts | list | `[]` | Additional volumeMounts to the main apps container. | | services.apps.extraVolumes | list | `[]` | Additional volumes to the apps pod. | | services.apps.httpLogging | int | `1` | Whether or not to log HTTP requests to the apps service. | @@ -168,6 +173,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml | services.automationWorkers.enabled | bool | `true` | Whether or not to enable the automation worker service. If you disable this, automations will be processed by the apps service. | | services.automationWorkers.extraContainers | list | `[]` | Additional containers to be added to the automationWorkers pod. | | services.automationWorkers.extraEnv | list | `[]` | Extra environment variables to set for automation worker pods. Takes a list of name=value pairs. | +| services.automationWorkers.extraEnvFromSecret | list | `[]` | Name of the K8s Secret in the same namespace which contains the extra environment variables. This can be used to avoid storing sensitive information in the values.yaml file. | | services.automationWorkers.extraVolumeMounts | list | `[]` | Additional volumeMounts to the main automationWorkers container. | | services.automationWorkers.extraVolumes | list | `[]` | Additional volumes to the automationWorkers pod. | | services.automationWorkers.livenessProbe | object | HTTP health checks. | Liveness probe configuration for automation worker pods. You shouldn't need to change this, but if you want to you can find more information here: | @@ -195,7 +201,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml | services.objectStore.region | string | `""` | AWS_REGION if using S3 | | services.objectStore.resources | object | `{}` | The resources to use for Minio pods. See for more information on how to set these. | | services.objectStore.secretKey | string | `""` | AWS_SECRET_ACCESS_KEY if using S3 | -| services.objectStore.storage | string | `"100Mi"` | How much storage to give Minio in its PersistentVolumeClaim. | +| services.objectStore.storage | string | `"2Gi"` | How much storage to give Minio in its PersistentVolumeClaim. | | services.objectStore.storageClass | string | `""` | If defined, storageClassName: If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. | | services.objectStore.url | string | `"http://minio-service:9000"` | URL to use for object storage. Only change this if you're using an external object store, such as S3. Remember to set `minio: false` if you do this. | | services.proxy.autoscaling.enabled | bool | `false` | Whether to enable horizontal pod autoscaling for the proxy service. | @@ -227,6 +233,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml | services.worker.autoscaling.targetCPUUtilizationPercentage | int | `80` | Target CPU utilization percentage for the worker service. Note that for autoscaling to work, you will need to have metrics-server configured, and resources set for the worker pods. | | services.worker.extraContainers | list | `[]` | Additional containers to be added to the worker pod. | | services.worker.extraEnv | list | `[]` | Extra environment variables to set for worker pods. Takes a list of name=value pairs. | +| services.worker.extraEnvFromSecret | list | `[]` | Name of the K8s Secret in the same namespace which contains the extra environment variables. This can be used to avoid storing sensitive information in the values.yaml file. | | services.worker.extraVolumeMounts | list | `[]` | Additional volumeMounts to the main worker container. | | services.worker.extraVolumes | list | `[]` | Additional volumes to the worker pod. | | services.worker.httpLogging | int | `1` | Whether or not to log HTTP requests to the worker service. |