forked from ITISFoundation/osparc-simcore
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request ITISFoundation#6724 from sanderegg/update-master-20
⬆️ Update from upstream master 20
- Loading branch information
Showing
240 changed files
with
5,492 additions
and
2,466 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,10 +17,12 @@ AGENT_VOLUMES_CLEANUP_S3_ENDPOINT=http://172.17.0.1:9001 | |
AGENT_VOLUMES_CLEANUP_S3_PROVIDER=MINIO | ||
AGENT_VOLUMES_CLEANUP_S3_REGION=us-east-1 | ||
AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678 | ||
AGENT_TRACING={} | ||
|
||
API_SERVER_DEV_FEATURES_ENABLED=0 | ||
API_SERVER_LOGLEVEL=INFO | ||
API_SERVER_PROFILING=1 | ||
API_SERVER_TRACING={} | ||
TRAEFIK_API_SERVER_INFLIGHTREQ_AMOUNT=25 | ||
|
||
AUTOSCALING_DASK=null | ||
|
@@ -33,6 +35,7 @@ AUTOSCALING_LOGLEVEL=INFO | |
AUTOSCALING_NODES_MONITORING=null | ||
AUTOSCALING_POLL_INTERVAL="00:00:10" | ||
AUTOSCALING_SSM_ACCESS=null | ||
AUTOSCALING_TRACING={} | ||
|
||
AWS_S3_CLI_S3=null | ||
|
||
|
@@ -44,6 +47,7 @@ CATALOG_PORT=8000 | |
CATALOG_PROFILING=1 | ||
CATALOG_SERVICES_DEFAULT_RESOURCES='{"CPU": {"limit": 0.1, "reservation": 0.1}, "RAM": {"limit": 2147483648, "reservation": 2147483648}}' | ||
CATALOG_SERVICES_DEFAULT_SPECIFICATIONS='{}' | ||
CATALOG_TRACING={} | ||
|
||
CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH='{"type":"tls","tls_ca_file":"/home/scu/.dask/dask-crt.pem","tls_client_cert":"/home/scu/.dask/dask-crt.pem","tls_client_key":"/home/scu/.dask/dask-key.pem"}' | ||
CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG=master-github-latest | ||
|
@@ -57,6 +61,7 @@ CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5 | |
CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null | ||
CLUSTERS_KEEPER_TASK_INTERVAL=30 | ||
CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES=null | ||
CLUSTERS_KEEPER_TRACING={} | ||
|
||
DASK_SCHEDULER_HOST=dask-scheduler | ||
DASK_SCHEDULER_PORT=8786 | ||
|
@@ -70,6 +75,7 @@ DIRECTOR_HOST=director | |
DIRECTOR_PORT=8080 | ||
DIRECTOR_REGISTRY_CACHING_TTL=900 | ||
DIRECTOR_REGISTRY_CACHING=True | ||
DIRECTOR_TRACING={} | ||
|
||
EFS_USER_ID=8006 | ||
EFS_USER_NAME=efs | ||
|
@@ -79,6 +85,10 @@ EFS_DNS_NAME=fs-xxx.efs.us-east-1.amazonaws.com | |
EFS_MOUNTED_PATH=/tmp/efs | ||
EFS_PROJECT_SPECIFIC_DATA_DIRECTORY=project-specific-data | ||
EFS_ONLY_ENABLED_FOR_USERIDS=[] | ||
EFS_GUARDIAN_TRACING={} | ||
|
||
# DATCORE_ADAPTER | ||
DATCORE_ADAPTER_TRACING={} | ||
|
||
# DIRECTOR_V2 ---- | ||
COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH='{"type":"tls","tls_ca_file":"/home/scu/.dask/dask-crt.pem","tls_client_cert":"/home/scu/.dask/dask-crt.pem","tls_client_key":"/home/scu/.dask/dask-key.pem"}' | ||
|
@@ -105,10 +115,13 @@ DYNAMIC_SIDECAR_LOG_LEVEL=DEBUG | |
DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=[] | ||
DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS={} | ||
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=01:00:00 | ||
# DIRECTOR_V2 ---- | ||
DIRECTOR_V2_TRACING={} | ||
|
||
# DYNAMIC_SCHEDULER ---- | ||
DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG | ||
DYNAMIC_SCHEDULER_PROFILING=1 | ||
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=01:00:00 | ||
DYNAMIC_SCHEDULER_TRACING={} | ||
|
||
FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}' | ||
|
||
|
@@ -122,6 +135,7 @@ INVITATIONS_PORT=8000 | |
INVITATIONS_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key=' | ||
INVITATIONS_SWAGGER_API_DOC_ENABLED=1 | ||
INVITATIONS_USERNAME=admin | ||
INVITATIONS_TRACING={} | ||
|
||
LOG_FORMAT_LOCAL_DEV_ENABLED=1 | ||
LOG_FILTER_MAPPING='{}' | ||
|
@@ -146,6 +160,7 @@ PAYMENTS_STRIPE_API_SECRET='REPLACE_ME_with_api_secret' | |
PAYMENTS_STRIPE_URL=https://api.stripe.com | ||
PAYMENTS_SWAGGER_API_DOC_ENABLED=1 | ||
PAYMENTS_USERNAME=admin | ||
PAYMENTS_TRACING={} | ||
|
||
POSTGRES_DB=simcoredb | ||
POSTGRES_ENDPOINT=postgres:5432 | ||
|
@@ -185,6 +200,7 @@ RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED=1 | |
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL=6 | ||
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC=300 | ||
RESOURCE_USAGE_TRACKER_S3=null | ||
RESOURCE_USAGE_TRACKER_TRACING={} | ||
|
||
# NOTE: 172.17.0.1 is the docker0 interface, which redirect from inside a container onto the host network interface. | ||
R_CLONE_OPTION_BUFFER_SIZE=0M | ||
|
@@ -218,6 +234,7 @@ STORAGE_HOST=storage | |
STORAGE_LOGLEVEL=INFO | ||
STORAGE_PORT=8080 | ||
STORAGE_PROFILING=1 | ||
STORAGE_TRACING={} | ||
# STORAGE ---- | ||
|
||
SWARM_STACK_NAME=master-simcore | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.