Skip to content

Commit 1ee9895

Browse files
efs improvements
1 parent e638627 commit 1ee9895

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@ async def get_dynamic_sidecar_spec( # pylint:disable=too-many-arguments# noqa:
404404
app_settings: AppSettings,
405405
*,
406406
has_quota_support: bool,
407-
allow_internet_access: bool,
408407
hardware_info: HardwareInfo | None,
409408
metrics_collection_allowed: bool,
410409
user_extra_properties: UserExtraProperties,
@@ -506,7 +505,7 @@ async def get_dynamic_sidecar_spec( # pylint:disable=too-many-arguments# noqa:
506505
compose_namespace,
507506
scheduler_data,
508507
app_settings,
509-
allow_internet_access=allow_internet_access,
508+
allow_internet_access=user_extra_properties.is_internet_enabled,
510509
metrics_collection_allowed=metrics_collection_allowed,
511510
telemetry_enabled=user_extra_properties.is_telemetry_enabled,
512511
),

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_event_create_sidecars.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ async def action(cls, app: FastAPI, scheduler_data: SchedulerData) -> None:
235235
app_settings=app.state.settings,
236236
hardware_info=scheduler_data.hardware_info,
237237
has_quota_support=dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_ENABLE_VOLUME_LIMITS,
238-
allow_internet_access=allow_internet_access,
239238
metrics_collection_allowed=metrics_collection_allowed,
240239
user_extra_properties=user_extra_properties,
241240
rpc_client=rpc_client,

services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,11 +454,10 @@ async def test_get_dynamic_proxy_spec(
454454
app_settings=minimal_app.state.settings,
455455
hardware_info=hardware_info,
456456
has_quota_support=False,
457-
allow_internet_access=False,
458457
metrics_collection_allowed=True,
459458
user_extra_properties=UserExtraProperties(
460-
is_internet_enabled=True,
461-
is_telemetry_enabled=False,
459+
is_internet_enabled=False,
460+
is_telemetry_enabled=True,
462461
is_efs_enabled=False,
463462
),
464463
rpc_client=Mock(),
@@ -553,11 +552,10 @@ async def test_merge_dynamic_sidecar_specs_with_user_specific_specs(
553552
app_settings=minimal_app.state.settings,
554553
hardware_info=hardware_info,
555554
has_quota_support=False,
556-
allow_internet_access=False,
557555
metrics_collection_allowed=True,
558556
user_extra_properties=UserExtraProperties(
559-
is_internet_enabled=True,
560-
is_telemetry_enabled=False,
557+
is_internet_enabled=False,
558+
is_telemetry_enabled=True,
561559
is_efs_enabled=False,
562560
),
563561
rpc_client=Mock(),

0 commit comments

Comments
 (0)