Skip to content

Commit

Permalink
Merge branch 'pydantic_v2_migration_do_not_squash_updates' into is448…
Browse files Browse the repository at this point in the history
…1/upgrade-director-v2-service
  • Loading branch information
giancarloromeo authored Nov 4, 2024
2 parents 4f32d2d + 24218c1 commit 44d7896
Show file tree
Hide file tree
Showing 283 changed files with 6,011 additions and 2,881 deletions.
8 changes: 4 additions & 4 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ flag_management:
threshold: 1%
- type: patch
target: auto
threshold: 1%


component_management:
Expand All @@ -31,7 +32,7 @@ component_management:
- packages/aws-library/**
- component_id: pkg_dask_task_models_library
paths:
- packages/dask-task-library/**
- packages/dask-task-models-library/**
- component_id: pkg_models_library
paths:
- packages/models-library/**
Expand Down Expand Up @@ -92,9 +93,6 @@ component_management:
- component_id: invitations
paths:
- services/invitations/**
- component_id: migration
paths:
- services/migration/**
- component_id: osparc_gateway_server
paths:
- services/osparc-gateway-server/**
Expand All @@ -119,10 +117,12 @@ coverage:
project:
default:
informational: true
threshold: 1%

patch:
default:
informational: true
threshold: 1%

comment:
layout: "header,diff,flags,components,footer"
Expand Down
34 changes: 18 additions & 16 deletions .env-devel
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# unset $(grep -v '^#' .env | sed -E 's/(.*)=.*/\1/' | xargs)
#

AGENT_LOGLEVEL=WARNING
AGENT_LOGLEVEL=INFO
AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY=12345678
AGENT_VOLUMES_CLEANUP_S3_BUCKET=simcore-volume-backups
AGENT_VOLUMES_CLEANUP_S3_ENDPOINT=http://172.17.0.1:9001
Expand All @@ -19,7 +19,7 @@ AGENT_VOLUMES_CLEANUP_S3_REGION=us-east-1
AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678

API_SERVER_DEV_FEATURES_ENABLED=0
API_SERVER_LOGLEVEL=WARNING
API_SERVER_LOGLEVEL=INFO
API_SERVER_PROFILING=1
TRAEFIK_API_SERVER_INFLIGHTREQ_AMOUNT=25

Expand All @@ -29,7 +29,7 @@ AUTOSCALING_DOCKER_JOIN_DRAINED=True
AUTOSCALING_WAIT_FOR_CLOUD_INIT_BEFORE_WARM_BUFFER_ACTIVATION=False
AUTOSCALING_EC2_ACCESS=null
AUTOSCALING_EC2_INSTANCES=null
AUTOSCALING_LOGLEVEL=WARNING
AUTOSCALING_LOGLEVEL=INFO
AUTOSCALING_NODES_MONITORING=null
AUTOSCALING_POLL_INTERVAL="00:00:10"
AUTOSCALING_SSM_ACCESS=null
Expand All @@ -39,7 +39,7 @@ AWS_S3_CLI_S3=null
CATALOG_BACKGROUND_TASK_REST_TIME=60
CATALOG_DEV_FEATURES_ENABLED=0
CATALOG_HOST=catalog
CATALOG_LOGLEVEL=WARNING
CATALOG_LOGLEVEL=INFO
CATALOG_PORT=8000
CATALOG_PROFILING=1
CATALOG_SERVICES_DEFAULT_RESOURCES='{"CPU": {"limit": 0.1, "reservation": 0.1}, "RAM": {"limit": 2147483648, "reservation": 2147483648}}'
Expand All @@ -52,15 +52,15 @@ CLUSTERS_KEEPER_DASK_WORKER_SATURATION=inf
CLUSTERS_KEEPER_EC2_ACCESS=null
CLUSTERS_KEEPER_SSM_ACCESS=null
CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX=""
CLUSTERS_KEEPER_LOGLEVEL=WARNING
CLUSTERS_KEEPER_LOGLEVEL=INFO
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

DASK_SCHEDULER_HOST=dask-scheduler
DASK_SCHEDULER_PORT=8786
DASK_SIDECAR_LOGLEVEL=WARNING
DASK_SIDECAR_LOGLEVEL=INFO
DASK_TLS_CA_FILE=/home/scu/.dask/dask-crt.pem
DASK_TLS_CERT=/home/scu/.dask/dask-crt.pem
DASK_TLS_KEY=/home/scu/.dask/dask-key.pem
Expand Down Expand Up @@ -91,7 +91,7 @@ DIRECTOR_V2_DYNAMIC_SCHEDULER_CLOSE_SERVICES_VIA_FRONTEND_WHEN_CREDITS_LIMIT_REA
DIRECTOR_V2_DYNAMIC_SIDECAR_SLEEP_AFTER_CONTAINER_REMOVAL=0
DIRECTOR_V2_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS='{}'
DIRECTOR_V2_HOST=director-v2
DIRECTOR_V2_LOGLEVEL=WARNING
DIRECTOR_V2_LOGLEVEL=INFO
DIRECTOR_V2_NODE_PORTS_STORAGE_AUTH=null
DIRECTOR_V2_PORT=8000
DIRECTOR_V2_PROFILING=1
Expand All @@ -104,18 +104,18 @@ DYNAMIC_SIDECAR_IMAGE=${DOCKER_REGISTRY:-itisfoundation}/dynamic-sidecar:${DOCKE
DYNAMIC_SIDECAR_LOG_LEVEL=DEBUG
DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=[]
DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS={}
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=3600
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=01:00:00
# DIRECTOR_V2 ----
DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG
DYNAMIC_SCHEDULER_PROFILING=1
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=3600
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=01:00:00

FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'

# Can use 'docker run -it itisfoundation/invitations:latest simcore-service-invitations generate-dotenv --auto-password'
INVITATIONS_DEFAULT_PRODUCT=osparc
INVITATIONS_HOST=invitations
INVITATIONS_LOGLEVEL=WARNING
INVITATIONS_LOGLEVEL=INFO
INVITATIONS_OSPARC_URL=http://127.0.0.1.nip.io:9081
INVITATIONS_PASSWORD=adminadmin
INVITATIONS_PORT=8000
Expand All @@ -124,6 +124,7 @@ INVITATIONS_SWAGGER_API_DOC_ENABLED=1
INVITATIONS_USERNAME=admin

LOG_FORMAT_LOCAL_DEV_ENABLED=1
LOG_FILTER_MAPPING='{}'

PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES=30
PAYMENTS_ACCESS_TOKEN_SECRET_KEY=2c0411810565e063309be1457009fb39ce023946f6a354e6935107b57676
Expand All @@ -138,7 +139,7 @@ PAYMENTS_FAKE_COMPLETION=0
PAYMENTS_GATEWAY_API_SECRET=adminadmin
PAYMENTS_GATEWAY_URL=http://127.0.0.1:32769
PAYMENTS_HOST=payments
PAYMENTS_LOGLEVEL=WARNING
PAYMENTS_LOGLEVEL=INFO
PAYMENTS_PASSWORD=adminadmin
PAYMENTS_PORT=8000
PAYMENTS_STRIPE_API_SECRET='REPLACE_ME_with_api_secret'
Expand Down Expand Up @@ -179,7 +180,7 @@ RESOURCE_MANAGER_RESOURCE_TTL_S=900
RESOURCE_USAGE_TRACKER_HOST=resource-usage-tracker
RESOURCE_USAGE_TRACKER_PORT=8000
RESOURCE_USAGE_TRACKER_EXTERNAL_PORT=8000
RESOURCE_USAGE_TRACKER_LOGLEVEL=WARNING
RESOURCE_USAGE_TRACKER_LOGLEVEL=INFO
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED=1
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL=6
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC=300
Expand Down Expand Up @@ -214,7 +215,7 @@ BF_API_KEY=none
BF_API_SECRET=none
STORAGE_ENDPOINT=storage:8080
STORAGE_HOST=storage
STORAGE_LOGLEVEL=WARNING
STORAGE_LOGLEVEL=INFO
STORAGE_PORT=8080
STORAGE_PROFILING=1
# STORAGE ----
Expand Down Expand Up @@ -245,7 +246,7 @@ WB_GC_GARBAGE_COLLECTOR='{"GARBAGE_COLLECTOR_INTERVAL_S": 30}'
WB_GC_GROUPS=0
WB_GC_INVITATIONS=null
WB_GC_LOGIN=null
WB_GC_LOGLEVEL=WARNING
WB_GC_LOGLEVEL=INFO
WB_GC_META_MODELING=0
WB_GC_NOTIFICATIONS=0
WB_GC_PAYMENTS=null
Expand Down Expand Up @@ -278,7 +279,7 @@ WB_DB_EL_GARBAGE_COLLECTOR=null
WB_DB_EL_GROUPS=0
WB_DB_EL_INVITATIONS=null
WB_DB_EL_LOGIN=null
WB_DB_EL_LOGLEVEL=WARNING
WB_DB_EL_LOGLEVEL=INFO
WB_DB_EL_META_MODELING=0
WB_DB_EL_NOTIFICATIONS=0
WB_DB_EL_PAYMENTS=null
Expand Down Expand Up @@ -309,6 +310,7 @@ LOGIN_ACCOUNT_DELETION_RETENTION_DAYS=31
LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0
LOGIN_REGISTRATION_INVITATION_REQUIRED=0
PROJECTS_INACTIVITY_INTERVAL=20
PROJECTS_TRASH_RETENTION_DAYS=7
PROJECTS_MAX_COPY_SIZE_BYTES=30Gib
PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES=5
REST_SWAGGER_API_DOC_ENABLED=1
Expand Down Expand Up @@ -347,7 +349,7 @@ WEBSERVER_GROUPS=1
WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180
WEBSERVER_HOST=webserver
WEBSERVER_LOGIN={}
WEBSERVER_LOGLEVEL=WARNING
WEBSERVER_LOGLEVEL=INFO
WEBSERVER_META_MODELING=1
WEBSERVER_NOTIFICATIONS=1
WEBSERVER_PAYMENTS={}
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"block-scoped-var": "warn",
"brace-style": [
"warn",
"stroustrup"
"1tbs"
],
"indent": [
"warn",
Expand Down
Loading

0 comments on commit 44d7896

Please sign in to comment.