Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion internal/driver/provisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ const (
labelKagentiInject = "kagenti.io/inject"
labelTenant = "openshell.ai/tenant"
labelKagentiTeam = "kagenti.io/team"
annotationSandboxID = "openshell.io/sandbox-id"
annotationSandboxID = "openshell.io/sandbox-id"
annotationBypassInboundCapture = "ambient.istio.io/bypass-inbound-capture"
)

// K8sProvisioner implements SandboxProvisioner using the Kubernetes API. It
Expand Down Expand Up @@ -383,6 +384,10 @@ func (p *K8sProvisioner) buildSandboxSpec(sb *pb.DriverSandbox) map[string]inter

podAnnotations := map[string]interface{}{
annotationSandboxID: sb.GetId(),
// Bypass Istio ambient inbound capture so ztunnel (HBONE mode) does not
// re-originate veth-pair connections from the pod's main IP, which breaks
// the proxy's /proc/net/tcp identity resolution.
annotationBypassInboundCapture: "true",
}

return map[string]interface{}{
Expand Down
3 changes: 3 additions & 0 deletions internal/driver/provisioner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@ func TestBuildSandboxSpec_Annotations(t *testing.T) {
if annotations[annotationSandboxID] != "sb-anno-123" {
t.Errorf("expected annotation %s=sb-anno-123, got %v", annotationSandboxID, annotations[annotationSandboxID])
}
if annotations[annotationBypassInboundCapture] != "true" {
t.Errorf("expected annotation %s=true, got %v", annotationBypassInboundCapture, annotations[annotationBypassInboundCapture])
}
}

func TestBuildSandboxSpec_TenantLabels(t *testing.T) {
Expand Down
Loading