From c5f04595e84c61813f2e942f7becd403656389ce Mon Sep 17 00:00:00 2001 From: Nawaz Dhandala Date: Wed, 4 Mar 2026 13:43:06 +0000 Subject: [PATCH] fix: Remove SERVER_WORKFLOW_HOSTNAME and related references to streamline configuration --- Common/Server/EnvironmentConfig.ts | 6 +----- HelmChart/Public/oneuptime/templates/_helpers.tpl | 4 ---- Nginx/default.conf.template | 6 +----- docker-compose.base.yml | 2 -- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/Common/Server/EnvironmentConfig.ts b/Common/Server/EnvironmentConfig.ts index a5c62e091d..c095ad9073 100644 --- a/Common/Server/EnvironmentConfig.ts +++ b/Common/Server/EnvironmentConfig.ts @@ -187,11 +187,7 @@ export const WorkerHostname: Hostname = Hostname.fromString( }`, ); -export const WorkflowHostname: Hostname = Hostname.fromString( - `${process.env["SERVER_WORKFLOW_HOSTNAME"] || "localhost"}:${ - process.env["WORKFLOW_PORT"] || 80 - }`, -); +export const WorkflowHostname: Hostname = WorkerHostname; export const HomeHostname: Hostname = Hostname.fromString( `${process.env["SERVER_HOME_HOSTNAME"] || "localhost"}:${ diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl index 3c9bf3dc7b..877485ada5 100644 --- a/HelmChart/Public/oneuptime/templates/_helpers.tpl +++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl @@ -103,8 +103,6 @@ Usage: value: {{ default "" $.Values.inboundEmail.domain | quote }} - name: INBOUND_EMAIL_WEBHOOK_SECRET value: {{ default "" $.Values.inboundEmail.webhookSecret | quote }} -- name: SERVER_WORKFLOW_HOSTNAME - value: {{ $.Release.Name }}-workflow.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_WORKER_HOSTNAME value: {{ $.Release.Name }}-worker.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_HOME_HOSTNAME @@ -131,8 +129,6 @@ Usage: value: {{ $.Values.home.ports.http | squote }} - name: WORKER_PORT value: {{ $.Values.worker.ports.http | squote }} -- name: WORKFLOW_PORT - value: {{ $.Values.workflow.ports.http | squote }} - name: STATUS_PAGE_PORT value: {{ $.Values.statusPage.ports.http | squote }} - name: DASHBOARD_PORT diff --git a/Nginx/default.conf.template b/Nginx/default.conf.template index 215fb91e30..8f3ebf2964 100644 --- a/Nginx/default.conf.template +++ b/Nginx/default.conf.template @@ -15,10 +15,6 @@ upstream worker { server ${SERVER_WORKER_HOSTNAME}:${WORKER_PORT} weight=10 max_fails=3 fail_timeout=30s; } -upstream workflow { - server ${SERVER_WORKFLOW_HOSTNAME}:${WORKFLOW_PORT} weight=10 max_fails=3 fail_timeout=30s; -} - upstream home { server ${SERVER_HOME_HOSTNAME}:${HOME_PORT} weight=10 max_fails=3 fail_timeout=30s; } @@ -859,7 +855,7 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE} proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - proxy_pass http://workflow; + proxy_pass http://worker; client_max_body_size 50M; } diff --git a/docker-compose.base.yml b/docker-compose.base.yml index ad51e1304c..ad003c8640 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -35,7 +35,6 @@ x-common-variables: &common-variables SERVER_OTEL_COLLECTOR_HOSTNAME: otel-collector SERVER_WORKER_HOSTNAME: worker SERVER_HOME_HOSTNAME: home - SERVER_WORKFLOW_HOSTNAME: worker #Ports. Usually they don't need to change. APP_PORT: ${APP_PORT} HOME_PORT: ${HOME_PORT} @@ -46,7 +45,6 @@ x-common-variables: &common-variables DASHBOARD_PORT: ${DASHBOARD_PORT} ADMIN_DASHBOARD_PORT: ${ADMIN_DASHBOARD_PORT} WORKER_PORT: ${WORKER_PORT} - WORKFLOW_PORT: ${WORKER_PORT} OPENTELEMETRY_EXPORTER_OTLP_ENDPOINT: ${OPENTELEMETRY_EXPORTER_OTLP_ENDPOINT} OPENTELEMETRY_EXPORTER_OTLP_HEADERS: ${OPENTELEMETRY_EXPORTER_OTLP_HEADERS}