Skip to content

Commit 607baa1

Browse files
authored
Merge branch 'master' into feature/trash-bin
2 parents 1164c2f + ba881e9 commit 607baa1

File tree

1,671 files changed

+33715
-24353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,671 files changed

+33715
-24353
lines changed

.env-devel

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ AGENT_VOLUMES_CLEANUP_S3_ENDPOINT=http://172.17.0.1:9001
1717
AGENT_VOLUMES_CLEANUP_S3_PROVIDER=MINIO
1818
AGENT_VOLUMES_CLEANUP_S3_REGION=us-east-1
1919
AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678
20+
AGENT_TRACING={}
2021

2122
API_SERVER_DEV_FEATURES_ENABLED=0
2223
API_SERVER_LOGLEVEL=INFO
@@ -32,7 +33,7 @@ AUTOSCALING_EC2_ACCESS=null
3233
AUTOSCALING_EC2_INSTANCES=null
3334
AUTOSCALING_LOGLEVEL=INFO
3435
AUTOSCALING_NODES_MONITORING=null
35-
AUTOSCALING_POLL_INTERVAL=10
36+
AUTOSCALING_POLL_INTERVAL="00:00:10"
3637
AUTOSCALING_SSM_ACCESS=null
3738
AUTOSCALING_TRACING={}
3839

@@ -69,11 +70,17 @@ DASK_TLS_CA_FILE=/home/scu/.dask/dask-crt.pem
6970
DASK_TLS_CERT=/home/scu/.dask/dask-crt.pem
7071
DASK_TLS_KEY=/home/scu/.dask/dask-key.pem
7172

73+
DIRECTOR_DEFAULT_MAX_MEMORY=2147483648
74+
DIRECTOR_DEFAULT_MAX_NANO_CPUS=1000000000
7275
DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS='{}'
7376
DIRECTOR_HOST=director
74-
DIRECTOR_PORT=8080
75-
DIRECTOR_REGISTRY_CACHING_TTL=900
77+
DIRECTOR_LOGLEVEL=INFO
78+
DIRECTOR_MONITORING_ENABLED=True
79+
DIRECTOR_PORT=8000
80+
DIRECTOR_PUBLISHED_HOST_NAME="127.0.0.1:9081"
81+
DIRECTOR_REGISTRY_CACHING_TTL=00:15:00
7682
DIRECTOR_REGISTRY_CACHING=True
83+
DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS=null
7784
DIRECTOR_TRACING={}
7885

7986
EFS_USER_ID=8006
@@ -113,13 +120,13 @@ DYNAMIC_SIDECAR_IMAGE=${DOCKER_REGISTRY:-itisfoundation}/dynamic-sidecar:${DOCKE
113120
DYNAMIC_SIDECAR_LOG_LEVEL=DEBUG
114121
DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=[]
115122
DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS={}
116-
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=3600
123+
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=01:00:00
117124
DIRECTOR_V2_TRACING={}
118125

119126
# DYNAMIC_SCHEDULER ----
120127
DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG
121128
DYNAMIC_SCHEDULER_PROFILING=1
122-
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=PT1H
129+
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=01:00:00
123130
DYNAMIC_SCHEDULER_TRACING={}
124131

125132
FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
@@ -185,6 +192,7 @@ REDIS_SECURE=false
185192
REDIS_USER=null
186193

187194
REGISTRY_AUTH=True
195+
REGISTRY_PATH=""
188196
REGISTRY_PW=adminadminadmin
189197
REGISTRY_SSL=True
190198
REGISTRY_URL=registry.osparc-master.speag.com

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Makefile @pcrespov @sanderegg
1313
/api/ @sanderegg @pcrespov @matusdrobuliak66
1414
/ci/ @sanderegg @pcrespov
1515
/docs/ @pcrespov
16-
/packages/models-library/ @sanderegg @pcrespov @matusdrobuliak66
16+
/packages/common-library/ @giancarloromeo
17+
/packages/models-library/ @sanderegg @pcrespov @matusdrobuliak66 @giancarloromeo
1718
/packages/postgres-database/ @matusdrobuliak66
1819
/packages/pytest-simcore/ @pcrespov @sanderegg
1920
/packages/service-integration/ @pcrespov @sanderegg @GitHK

0 commit comments

Comments
 (0)