From d48362017fe77a4da6b2a33f090bba2cb2ee058d Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 19 Dec 2023 15:07:50 +0000 Subject: [PATCH 1/4] Allow the specifying of custom command and args values in Helm chart. --- charts/budibase/templates/app-service-deployment.yaml | 8 ++++++++ .../templates/automation-worker-service-deployment.yaml | 8 ++++++++ charts/budibase/templates/proxy-service-deployment.yaml | 8 ++++++++ charts/budibase/templates/worker-service-deployment.yaml | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 9fb435c2a3..9ed863a611 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -244,4 +244,12 @@ spec: {{ end }} restartPolicy: Always serviceAccountName: "" + {{ if .Values.services.apps.command }} + command: + {{- toYaml .Values.services.apps.command | nindent 8 }} + {{ end }} + {{ if .Values.services.apps.args }} + args: + {{- toYaml .Values.services.apps.args | nindent 8 }} + {{ end }} status: {} diff --git a/charts/budibase/templates/automation-worker-service-deployment.yaml b/charts/budibase/templates/automation-worker-service-deployment.yaml index 46be6a4435..6032f33bed 100644 --- a/charts/budibase/templates/automation-worker-service-deployment.yaml +++ b/charts/budibase/templates/automation-worker-service-deployment.yaml @@ -244,5 +244,13 @@ spec: {{ end }} restartPolicy: Always serviceAccountName: "" + {{ if .Values.services.automationWorkers.command }}} + command: + {{- toYaml .Values.services.automationWorkers.command | nindent 8 }} + {{ end }} + {{ if .Values.services.automationWorkers.args }} + args: + {{- toYaml .Values.services.automationWorkers.args | nindent 8 }} + {{ end }} status: {} {{- end }} \ No newline at end of file diff --git a/charts/budibase/templates/proxy-service-deployment.yaml b/charts/budibase/templates/proxy-service-deployment.yaml index 706e9b4b73..2e6217008b 100644 --- a/charts/budibase/templates/proxy-service-deployment.yaml +++ b/charts/budibase/templates/proxy-service-deployment.yaml @@ -100,5 +100,13 @@ spec: {{ end }} restartPolicy: Always serviceAccountName: "" + {{ if .Values.services.proxy.command }} + command: + {{- toYaml .Values.services.proxy.command | nindent 8 }} + {{ end }} + {{ if .Values.services.proxy.args }} + args: + {{- toYaml .Values.services.proxy.args | nindent 8 }} + {{ end }} volumes: status: {} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index 1d90aaf954..32ffb46a90 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -230,4 +230,12 @@ spec: {{ end }} restartPolicy: Always serviceAccountName: "" + {{ if .Values.services.worker.command }} + command: + {{- toYaml .Values.services.worker.command | nindent 8 }} + {{ end }} + {{ if .Values.services.worker.args }} + args: + {{- toYaml .Values.services.worker.args | nindent 8 }} + {{ end }} status: {} From 4d8068000c5cc1812b3b81e86320fcaa72ca6542 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 19 Dec 2023 15:58:08 +0000 Subject: [PATCH 2/4] adding var to allow s3 support in the single image --- hosting/single/runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index f4b2b5b127..07b9aae71d 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -7,7 +7,7 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME [[ -z "${BUDIBASE_ENVIRONMENT}" ]] && export BUDIBASE_ENVIRONMENT=PRODUCTION [[ -z "${CLUSTER_PORT}" ]] && export CLUSTER_PORT=80 [[ -z "${DEPLOYMENT_ENVIRONMENT}" ]] && export DEPLOYMENT_ENVIRONMENT=docker -[[ -z "${MINIO_URL}" ]] && export MINIO_URL=http://127.0.0.1:9000 +[[ -z "${MINIO_URL}" ]] && [[ -z "${USE_S3}" ]] && export MINIO_URL=http://127.0.0.1:9000 [[ -z "${NODE_ENV}" ]] && export NODE_ENV=production [[ -z "${POSTHOG_TOKEN}" ]] && export POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU [[ -z "${TENANT_FEATURE_FLAGS}" ]] && export TENANT_FEATURE_FLAGS="*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR" From 34d1046c6d4d8e000bb323bd8ec967492b2b8446 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 19 Dec 2023 16:04:18 +0000 Subject: [PATCH 3/4] Bump version to 2.13.48 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 131880a60d..d2a623fcd2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.13.47", + "version": "2.13.48", "npmClient": "yarn", "packages": [ "packages/*", From f58e1f6f0b5dc93ce780962c104e081706c8d8ba Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 19 Dec 2023 16:17:55 +0000 Subject: [PATCH 4/4] don't start minio with s3 --- hosting/single/runner.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index 07b9aae71d..eb9ec07464 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -77,7 +77,12 @@ mkdir -p ${DATA_DIR}/minio chown -R couchdb:couchdb ${DATA_DIR}/couch redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & /bbcouch-runner.sh & -/minio/minio server --console-address ":9001" ${DATA_DIR}/minio > /dev/stdout 2>&1 & + +# only start minio if use s3 isn't passed +if [[ -z "${USE_S3}"]]; then + /minio/minio server --console-address ":9001" ${DATA_DIR}/minio > /dev/stdout 2>&1 & +fi + /etc/init.d/nginx restart if [[ ! -z "${CUSTOM_DOMAIN}" ]]; then # Add monthly cron job to renew certbot certificate