Skip to content

feat(server): disable IPv6 in execd init for k8s egress; refactor helpers #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pangjiping merged 1 commit into from
Mar 20, 2026
Merged

feat(server): disable IPv6 in execd init for k8s egress; refactor helpers #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions server/src/services/k8s/agent_sandbox_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
from src.services.k8s.egress_helper import (
apply_egress_to_spec,
build_security_context_for_sandbox_container,
prep_execd_init_for_egress,
)
from src.services.k8s.security_context import (
build_security_context_from_dict,
serialize_security_context_to_dict,
)
Expand Down Expand Up @@ -222,7 +225,10 @@ def _build_pod_spec(
egress_mode: str = EGRESS_MODE_DNS,
) -> Dict[str, Any]:
"""Build pod spec dict for the Sandbox CRD."""
init_container = self._build_execd_init_container(execd_image)
disable_ipv6_for_egress = network_policy is not None and egress_image is not None
init_container = self._build_execd_init_container(
execd_image, disable_ipv6_for_egress=disable_ipv6_for_egress
)
main_container = self._build_main_container(
image_spec=image_spec,
entrypoint=entrypoint,
Expand Down Expand Up @@ -252,7 +258,6 @@ def _build_pod_spec(

# Add egress sidecar if network policy is provided
apply_egress_to_spec(
pod_spec=pod_spec,
containers=containers,
network_policy=network_policy,
egress_image=egress_image,
Expand All @@ -262,14 +267,23 @@ def _build_pod_spec(

return pod_spec

def _build_execd_init_container(self, execd_image: str) -> V1Container:
def _build_execd_init_container(
self,
execd_image: str,
*,
disable_ipv6_for_egress: bool = False,
) -> V1Container:
"""Build init container that copies execd binary to the shared volume."""
script = (
"cp ./execd /opt/opensandbox/bin/execd && "
"cp ./bootstrap.sh /opt/opensandbox/bin/bootstrap.sh && "
"chmod +x /opt/opensandbox/bin/execd && "
"chmod +x /opt/opensandbox/bin/bootstrap.sh"
)
security_context = None
if disable_ipv6_for_egress:
script, sc_dict = prep_execd_init_for_egress(script)
security_context = build_security_context_from_dict(sc_dict)

resources = None
if self.execd_init_resources:
Expand All @@ -290,6 +304,7 @@ def _build_execd_init_container(self, execd_image: str) -> V1Container:
)
],
resources=resources,
security_context=security_context,
)

def _build_main_container(
Expand Down
23 changes: 20 additions & 3 deletions server/src/services/k8s/batchsandbox_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
from src.services.k8s.egress_helper import (
apply_egress_to_spec,
build_security_context_for_sandbox_container,
prep_execd_init_for_egress,
)
from src.services.k8s.security_context import (
build_security_context_from_dict,
serialize_security_context_to_dict,
)
Expand Down Expand Up @@ -181,7 +184,10 @@ def create_workload(
extra_volumes, extra_mounts = self._extract_template_pod_extras()

# Build init container for execd installation
init_container = self._build_execd_init_container(execd_image)
disable_ipv6_for_egress = network_policy is not None and egress_image is not None
init_container = self._build_execd_init_container(
execd_image, disable_ipv6_for_egress=disable_ipv6_for_egress
)

# Build main container with execd support
main_container = self._build_main_container(
Expand Down Expand Up @@ -219,7 +225,6 @@ def create_workload(

# Add egress sidecar if network policy is provided
apply_egress_to_spec(
pod_spec=pod_spec,
containers=containers,
network_policy=network_policy,
egress_image=egress_image,
Expand Down Expand Up @@ -490,7 +495,12 @@ def _build_task_template(
}
}

def _build_execd_init_container(self, execd_image: str) -> V1Container:
def _build_execd_init_container(
self,
execd_image: str,
*,
disable_ipv6_for_egress: bool = False,
) -> V1Container:
"""
Build init container for execd installation.

Expand All @@ -503,6 +513,8 @@ def _build_execd_init_container(self, execd_image: str) -> V1Container:

Args:
execd_image: execd container image
disable_ipv6_for_egress: When True, disable IPv6 in the Pod netns first
(privileged) then install binaries; used with egress sidecar.

Returns:
V1Container: Init container spec
Expand All @@ -514,6 +526,10 @@ def _build_execd_init_container(self, execd_image: str) -> V1Container:
"chmod +x /opt/opensandbox/bin/execd && "
"chmod +x /opt/opensandbox/bin/bootstrap.sh"
)
security_context = None
if disable_ipv6_for_egress:
script, sc_dict = prep_execd_init_for_egress(script)
security_context = build_security_context_from_dict(sc_dict)

resources = None
if self.execd_init_resources:
Expand All @@ -534,6 +550,7 @@ def _build_execd_init_container(self, execd_image: str) -> V1Container:
)
],
resources=resources,
security_context=security_context,
)

def _build_main_container(
Expand Down
Loading