mirror of
https://github.com/OneUptime/oneuptime.git
synced 2026-04-06 00:32:12 +02:00
Add volume for certs in app.yaml and remove workers.yaml
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
# OneUptime app Deployment
|
||||
{{- $appEnv := dict "PORT" $.Values.port.app "SMS_HIGH_RISK_COST_IN_CENTS" $.Values.billing.smsHighRiskValueInCents "CALL_HIGH_RISK_COST_IN_CENTS_PER_MINUTE" $.Values.billing.callHighRiskValueInCentsPerMinute "SMS_DEFAULT_COST_IN_CENTS" $.Values.billing.smsDefaultValueInCents "CALL_DEFAULT_COST_IN_CENTS_PER_MINUTE" $.Values.billing.callDefaultValueInCentsPerMinute "INTERNAL_SMTP_FROM_NAME" $.Values.internalSmtp.name "INTERNAL_SMTP_EMAIL" $.Values.internalSmtp.email "INTERNAL_SMTP_PASSWORD" "internal_smtp_password" -}}
|
||||
{{- $certVolume := dict "Name" (printf "%s-%s" $.Release.Name "certs") "MountPath" "/usr/src/Certs" }}
|
||||
{{- $appVolumes := dict "certs" $certVolume }}
|
||||
{{- $appEnv := dict "PORT" $.Values.port.app "Volumes" $appVolumes "SMS_HIGH_RISK_COST_IN_CENTS" $.Values.billing.smsHighRiskValueInCents "CALL_HIGH_RISK_COST_IN_CENTS_PER_MINUTE" $.Values.billing.callHighRiskValueInCentsPerMinute "SMS_DEFAULT_COST_IN_CENTS" $.Values.billing.smsDefaultValueInCents "CALL_DEFAULT_COST_IN_CENTS_PER_MINUTE" $.Values.billing.callDefaultValueInCentsPerMinute "INTERNAL_SMTP_FROM_NAME" $.Values.internalSmtp.name "INTERNAL_SMTP_EMAIL" $.Values.internalSmtp.email "INTERNAL_SMTP_PASSWORD" "internal_smtp_password" -}}
|
||||
{{- $appDeploymentArgs :=dict "IsServer" true "ServiceName" "app" "Port" $.Values.port.app "Release" $.Release "Values" $.Values "Env" $appEnv -}}
|
||||
{{- include "oneuptime.deployment" $appDeploymentArgs }}
|
||||
---
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
# OneUptime workers Deployment
|
||||
|
||||
# attach certs volume to workers whcih is used to store custom status page certs which is then used by nginx
|
||||
{{- $certVolume := dict "Name" (printf "%s-%s" $.Release.Name "certs") "MountPath" "/usr/src/Certs" }}
|
||||
{{- $workerVolumes := dict "certs" $certVolume }}
|
||||
{{- $workersEnv := dict "PORT" $.Values.port.workers -}}
|
||||
{{- $workersDeploymentArgs :=dict "IsServer" true "ServiceName" "workers" "Port" $.Values.port.workers "Release" $.Release "Values" $.Values "Env" $workersEnv "Volumes" $workerVolumes -}}
|
||||
{{- include "oneuptime.deployment" $workersDeploymentArgs }}
|
||||
---
|
||||
|
||||
# OneUptime workers Service
|
||||
|
||||
{{- $workersServiceArgs := dict "ServiceName" "workers" "Port" $.Values.port.workers "Release" $.Release "Values" $.Values -}}
|
||||
{{- include "oneuptime.service" $workersServiceArgs }}
|
||||
---
|
||||
|
||||
# OneUptime workers autoscaler
|
||||
{{- $workersAutoScalerArgs := dict "ServiceName" "workers" "Release" $.Release "Values" $.Values -}}
|
||||
{{- include "oneuptime.autoscaler" $workersAutoScalerArgs }}
|
||||
---
|
||||
@@ -203,10 +203,11 @@ services:
|
||||
depends_on:
|
||||
- redis
|
||||
- postgres
|
||||
|
||||
links:
|
||||
- redis
|
||||
- postgres
|
||||
volumes:
|
||||
- ./Certs:/usr/src/Certs
|
||||
|
||||
workflow:
|
||||
networks:
|
||||
@@ -218,31 +219,10 @@ services:
|
||||
depends_on:
|
||||
- redis
|
||||
- postgres
|
||||
|
||||
links:
|
||||
- redis
|
||||
- postgres
|
||||
|
||||
|
||||
|
||||
workers:
|
||||
networks:
|
||||
- oneuptime
|
||||
restart: always
|
||||
environment:
|
||||
<<: *common-server-variables
|
||||
PORT: ${WORKERS_PORT}
|
||||
ENVIRONMENT: ${ENVIRONMENT}
|
||||
depends_on:
|
||||
- postgres
|
||||
|
||||
links:
|
||||
- postgres
|
||||
|
||||
volumes:
|
||||
- ./Certs:/usr/src/Certs
|
||||
|
||||
|
||||
|
||||
probe-1:
|
||||
networks:
|
||||
|
||||
@@ -224,31 +224,6 @@ services:
|
||||
dockerfile: ./Workflow/Dockerfile
|
||||
|
||||
|
||||
workers:
|
||||
volumes:
|
||||
- ./Workers:/usr/src/app
|
||||
# Use node modules of the container and not host system.
|
||||
# https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
|
||||
- /usr/src/app/node_modules/
|
||||
- ./Common:/usr/src/Common
|
||||
- ./Model:/usr/src/Model
|
||||
- ./CommonServer:/usr/src/CommonServer
|
||||
- ./CommonUI:/usr/src/CommonUI
|
||||
- /usr/src/Common/node_modules/
|
||||
- /usr/src/CommonUI/node_modules/
|
||||
- /usr/src/CommonServer/node_modules/
|
||||
- /usr/src/Model/node_modules/
|
||||
ports:
|
||||
- '9654:9229' # Debugging port.
|
||||
extends:
|
||||
file: ./docker-compose.base.yml
|
||||
service: workers
|
||||
build:
|
||||
network: host
|
||||
context: .
|
||||
dockerfile: ./Workers/Dockerfile
|
||||
|
||||
|
||||
|
||||
probe-1:
|
||||
volumes:
|
||||
|
||||
@@ -73,15 +73,6 @@ services:
|
||||
extends:
|
||||
file: ./docker-compose.base.yml
|
||||
service: workflow
|
||||
|
||||
|
||||
workers:
|
||||
image: oneuptime/workers:${APP_TAG}
|
||||
extends:
|
||||
file: ./docker-compose.base.yml
|
||||
service: workers
|
||||
|
||||
|
||||
|
||||
probe-1:
|
||||
image: oneuptime/probe:${APP_TAG}
|
||||
|
||||
Reference in New Issue
Block a user