Skip to content

Commit be27c67

Browse files
authored
build: specify app config in deployment config (#239)
1 parent 1ff7f06 commit be27c67

File tree

3 files changed

+116
-8
lines changed

3 files changed

+116
-8
lines changed
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
{{- $appconfig := "# Empty, this configMap will be filled by Job (configmap-job-cwlwes)" }}
2-
{{- $config_map := (lookup "v1" "ConfigMap" .Release.Namespace "app-config") }}
3-
{{- if $config_map }}
4-
{{- $appconfig = index $config_map.data "app_config.yaml" }}
5-
{{- end }}
61
apiVersion: v1
72
data:
8-
app_config.yaml: {{ $appconfig | quote }}
3+
app_config.yaml: {{ .Values.wes.appConfig | quote }}
94
kind: ConfigMap
105
metadata:
116
name: app-config

deployment/templates/wes/wes-configmap.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
{{- if .Values.wes.configWithJob }}
22
apiVersion: batch/v1
33
kind: Job
44
metadata:
@@ -23,4 +23,4 @@ spec:
2323
restartPolicy: Never
2424
serviceAccountName: {{ .Values.wes.appName }}-autoadmin
2525
status: {}
26-
26+
{{- end }}

deployment/values.yaml

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,119 @@ wes:
3434
storageClass: nfs-client # <- wes-volume.yaml, only for K8S, a storageClass with readWriteMany capability is required
3535
volumeSize: 1Gi
3636
redirect: false
37+
configWithJob: false
38+
appConfig: |
39+
# General server/service settings
40+
#
41+
# Any change in this file will be detected by gunicorn and the configuration will be reloaded.
42+
#
43+
server:
44+
host: '0.0.0.0'
45+
port: 8080
46+
debug: True
47+
environment: development
48+
testing: False
49+
use_reloader: True
50+
51+
# Security settings
52+
security:
53+
authorization_required: False
54+
jwt:
55+
add_key_to_claims: True
56+
algorithms:
57+
- RS256
58+
allow_expired: False
59+
audience: null # list of allowed audiences or 'null' (do not validate audience)
60+
claim_identity: sub
61+
claim_issuer: iss
62+
claim_key_id: kid
63+
header_name: Authorization
64+
token_prefix: Bearer
65+
validation_methods:
66+
- userinfo
67+
- public_key
68+
validation_checks: all # 'any' or 'all'
69+
70+
# Database settings
71+
database:
72+
host: mongodb
73+
port: 27017
74+
name: cwl-wes-db
75+
run_id:
76+
length: 6
77+
charset: string.ascii_uppercase + string.digits
78+
79+
# Storage
80+
storage:
81+
permanent_dir: '/data/output'
82+
tmp_dir: '/data/tmp'
83+
remote_storage_url: 'ftp://ftp-private.ebi.ac.uk/upload/foivos'
84+
85+
# Celery task queue
86+
celery:
87+
broker_host: rabbitmq
88+
broker_port: 5672
89+
result_backend: 'rpc://'
90+
include:
91+
- cwl_wes.tasks.tasks.run_workflow
92+
- cwl_wes.tasks.tasks.cancel_run
93+
monitor:
94+
timeout: 0.1
95+
message_maxsize: 16777216
96+
97+
# OpenAPI specs
98+
api:
99+
specs:
100+
- path: '20181010.be85140.workflow_execution_service.swagger.yaml'
101+
strict_validation: True
102+
validate_responses: True
103+
swagger_ui: True
104+
swagger_json: True
105+
endpoint_params:
106+
default_page_size: 5
107+
timeout_cancel_run: 60
108+
timeout_run_workflow: Null
109+
110+
# WES service info settings
111+
service_info:
112+
contact_info: 'https://github.com/elixir-cloud-aai/cwl-WES'
113+
auth_instructions_url: 'https://www.elixir-europe.org/services/compute/aai'
114+
supported_filesystem_protocols:
115+
- ftp
116+
- https
117+
- local
118+
supported_wes_versions:
119+
- 1.0.0
120+
workflow_type_versions:
121+
CWL:
122+
workflow_type_version:
123+
- v1.0
124+
workflow_engine_versions:
125+
cwl-tes: 0.2.0
126+
default_workflow_engine_parameters:
127+
- type: string
128+
default_value: some_string
129+
- type: int
130+
default_value: '5'
131+
tags:
132+
known_tes_endpoints: 'https://tes.tsi.ebi.ac.uk/|https://tes-dev.tsi.ebi.ac.uk/|https://csc-tesk.c03.k8s-popup.csc.fi/|https://tesk.c01.k8s-popup.csc.fi/'
133+
app_version: 0.15.0
134+
135+
# TES server
136+
tes:
137+
url: 'https://csc-tesk.c03.k8s-popup.csc.fi/'
138+
timeout: 5
139+
status_query_params: 'FULL'
140+
141+
# DRS integration
142+
drs:
143+
port: Null # use this port for resolving DRS URIs; set to `Null` to use default (443)
144+
base_path: Null # use this base path for resolving DRS URIs; set to `Null` to use default (`ga4gh/drs/v1`)
145+
use_http: False # use `http` for resolving DRS URIs; set to `False` to use default (`https`)
146+
file_types: # extensions of files to scan for DRS URI resolution
147+
- cwl
148+
- yaml
149+
- yml
37150
# Activate/deactivate the '/' to '/ga4gh/wes/v1/ui/' redirection
38151

39152
celeryWorker:

0 commit comments

Comments
 (0)