From c33ea4dcfe0cbf9c54deb56edb09bbdb76c557a9 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Mar 2023 16:13:26 +0000 Subject: [PATCH] Update deployment templates to remove unused cdn url and fix empty env vars (#9967) --- charts/budibase/templates/app-service-deployment.yaml | 6 ++---- charts/budibase/templates/worker-service-deployment.yaml | 2 -- packages/server/src/environment.ts | 1 - packages/worker/src/environment.ts | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 6b0a0338d6..89e7db7796 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -125,9 +125,9 @@ spec: - name: SELF_HOSTED value: {{ .Values.globals.selfHosted | quote }} - name: SENTRY_DSN - value: {{ .Values.globals.sentryDSN }} + value: {{ .Values.globals.sentryDSN | quote }} - name: POSTHOG_TOKEN - value: {{ .Values.globals.posthogToken }} + value: {{ .Values.globals.posthogToken | quote }} - name: WORKER_URL value: http://worker-service:{{ .Values.services.worker.port }} - name: PLATFORM_URL @@ -198,8 +198,6 @@ spec: - name: GLOBAL_AGENT_NO_PROXY value: {{ .Values.globals.globalAgentNoProxy | quote }} {{ end }} - - name: CDN_URL - value: {{ .Values.globals.cdnUrl }} {{ if .Values.services.tlsRejectUnauthorized }} - name: NODE_TLS_REJECT_UNAUTHORIZED value: {{ .Values.services.tlsRejectUnauthorized }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index f4305fbb00..0e053dfb5a 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -188,8 +188,6 @@ spec: - name: GLOBAL_AGENT_NO_PROXY value: {{ .Values.globals.globalAgentNoProxy | quote }} {{ end }} - - name: CDN_URL - value: {{ .Values.globals.cdnUrl }} {{ if .Values.services.tlsRejectUnauthorized }} - name: NODE_TLS_REJECT_UNAUTHORIZED value: {{ .Values.services.tlsRejectUnauthorized }} diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index 256d8d10c3..715715e42b 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -46,7 +46,6 @@ const environment = { AWS_REGION: process.env.AWS_REGION, MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, - CDN_URL: process.env.CDN_URL || "https://cdn.budi.live", REDIS_URL: process.env.REDIS_URL, REDIS_PASSWORD: process.env.REDIS_PASSWORD, INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index cd5360f7f7..c6618a75df 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -42,7 +42,6 @@ const environment = { ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL, PLATFORM_URL: process.env.PLATFORM_URL, APPS_URL: process.env.APPS_URL, - CDN_URL: process.env.CDN_URL || "https://tenants.cdn.budi.live", // ports // prefer worker port to generic port PORT: process.env.WORKER_PORT || process.env.PORT,