Skip to content

Commit

Permalink
remove old proxy tunnels
Browse files Browse the repository at this point in the history
  • Loading branch information
aksh-at committed Feb 23, 2025
1 parent b6d0200 commit 3187cf4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 75 deletions.
9 changes: 3 additions & 6 deletions modal/_container_entrypoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
_find_callables_for_obj,
_PartialFunctionFlags,
)
from modal._proxy_tunnel import proxy_tunnel
from modal._serialization import deserialize_params
from modal._utils.async_utils import TaskContext, synchronizer
from modal._utils.function_utils import (
Expand Down Expand Up @@ -594,11 +593,9 @@ def breakpoint_wrapper():
client = Client.from_env()

try:
with proxy_tunnel(container_args.proxy_info):
try:
main(container_args, client)
except UserException:
logger.info("User exception caught, exiting")
main(container_args, client)
except UserException:
logger.info("User exception caught, exiting")
except KeyboardInterrupt:
logger.debug("Container: interrupted")

Expand Down
6 changes: 0 additions & 6 deletions modal/_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -514,12 +514,6 @@ def from_local(
if is_generator:
raise InvalidError("Generator functions do not support retries.")

if proxy:
# HACK: remove this once we stop using ssh tunnels for this.
if image:
# TODO(elias): this will cause an error if users use prior `.add_local_*` commands without copy=True
image = image.apt_install("autossh")

function_spec = _FunctionSpec(
mounts=all_mounts,
secrets=secrets,
Expand Down
63 changes: 0 additions & 63 deletions modal/_proxy_tunnel.py

This file was deleted.

0 comments on commit 3187cf4

Please sign in to comment.