feat(components/ingress): replace pod with batch sandbox cr

Author: Generalwin

components/ingress/DEVELOPMENT.md

@@ -3,27 +3,26 @@
 ## Prerequisites
 - Go 1.24+
 - Docker (optional, for image build)
-- Access to a Kubernetes cluster if you want to exercise proxy behavior.
+- Access to a Kubernetes cluster with BatchSandbox CRD installed.
 
 ## Install deps
 ```bash
-cd components/router
+cd components/ingress
 go mod tidy && go mod vendor
 ```
 
 ## Build & Run
 ```bash
-make build          # binary at bin/router with ldflags version info
-./bin/router \
-  --namespace <ns> \
-  --ingress-label-key <label-key> \
+make build          # binary at bin/ingress with ldflags version info
+./bin/ingress \
+  --namespace <target-namespace> \
   --port 28888 \
   --log-level info
 ```
 
 ## Tests & Lint
 ```bash
-make test           # go test ./pkg/...
+make test           # go test ./...
 go vet ./...        # included in make build
 ```
 
@@ -33,15 +32,18 @@ docker build \
   --build-arg VERSION=$(git describe --tags --always --dirty) \
   --build-arg GIT_COMMIT=$(git rev-parse HEAD) \
   --build-arg BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
-  -t opensandbox/router:dev .
+  -t opensandbox/ingress:dev .
 ```
 
 ## Key Paths
-- `main.go` — entrypoint, HTTP routes.
-- `pkg/proxy/` — HTTP/WebSocket proxy logic and pod watching.
+- `main.go` — entrypoint, HTTP routes, provider initialization.
+- `pkg/proxy/` — HTTP/WebSocket reverse proxy logic.
+- `pkg/sandbox/` — Sandbox provider abstraction and BatchSandbox implementation.
 - `version/` — build metadata (ldflags).
 
 ## Tips
 - Health check: `/status.ok`
+- Proxy endpoint: `/` (routes based on `OPEN-SANDBOX-INGRESS` header or Host)
 - Env overrides: `VERSION/GIT_COMMIT/BUILD_TIME` usable via Makefile and build.sh.
+- BatchSandbox must have `sandbox.opensandbox.io/endpoints` annotation with JSON array of IPs.
 

components/ingress/Makefile

@@ -37,3 +37,7 @@ LDFLAGS := -X 'github.com/alibaba/opensandbox/router/version.Version=$(VERSION)'
 build: vet ## Build the binary.
 	@mkdir -p bin
 	go build -ldflags "$(LDFLAGS)" -o bin/router main.go
+
+.PHONY: clean
+clean: ## Clean build artifacts.
+	rm -rf bin/ vendor/

components/ingress/README.md

@@ -3,15 +3,14 @@
 English | [中文](README_zh.md)
 
 ## Overview
-- HTTP/WebSocket reverse proxy that routes to sandbox Pods by `OPEN-SANDBOX-INGRESS` header or Host.
-- Watches Pods in a target Namespace filtered by an ingress label, and routes only when exactly one ready Pod matches.
+- HTTP/WebSocket reverse proxy that routes to sandbox instances by `OPEN-SANDBOX-INGRESS` header or Host.
+- Watches BatchSandbox CRs in a target Namespace, and routes to sandbox endpoints from annotations.
 - Exposes `/status.ok` health check; prints build metadata (version, commit, time, Go/platform) at startup.
 
 ## Quick Start
 ```bash
 go run main.go \
   --namespace <target-namespace> \
-  --ingress-label-key <label-key> \
   --port 28888 \
   --log-level info
 ```
@@ -44,11 +43,15 @@ TAG=local VERSION=1.2.3 GIT_COMMIT=abc BUILD_TIME=2025-01-01T00:00:00Z bash buil
 
 ## Runtime Requirements
 - Access to Kubernetes API (in-cluster or via KUBECONFIG).
-- Pods in the specified Namespace labeled with the configured ingress label; Pod IPs must be reachable.
+- BatchSandbox CRs in the specified Namespace with `sandbox.opensandbox.io/endpoints` annotation containing Pod IPs.
 
 ## Behavior Notes
-- Routing key priority: `OPEN-SANDBOX-INGRESS` header first, otherwise Host parsing `<ingress>-<port>.*`.
-- Multiple matching Pods → HTTP 409; no matching Pod → HTTP 404.
+- Routing key priority: `OPEN-SANDBOX-INGRESS` header first, otherwise Host parsing `<sandbox-name>-<port>.*`.
+- Sandbox name extracted from request is used to query BatchSandbox CR for endpoint IP.
+- Error handling:
+  - `ErrSandboxNotFound` (sandbox resource not exists) → HTTP 404
+  - `ErrSandboxNotReady` (not enough replicas, missing endpoints, invalid config) → HTTP 503
+  - Other errors (K8s API errors, etc.) → HTTP 502
 - WebSocket path forwards essential headers and X-Forwarded-*; HTTP path strips `OPEN-SANDBOX-INGRESS` before proxying.
 
 ## Development & Tests
@@ -58,6 +61,7 @@ go test ./...
 ```
 Key code:
 - `main.go`: entrypoint and handlers.
-- `pkg/proxy/`: HTTP/WebSocket proxy logic, pod watching, health check.
+- `pkg/proxy/`: HTTP/WebSocket proxy logic, sandbox endpoint resolution.
+- `pkg/sandbox/`: Sandbox provider abstraction and BatchSandbox implementation.
 - `version/`: build metadata output (populated via ldflags).
 

components/ingress/README_zh.md

@@ -1,20 +1,18 @@
 # OpenSandbox Ingress
 
 ## 功能概览
-- 基于 Kubernetes Pod 标签的 HTTP / WebSocket 反向代理，按 `OPEN-SANDBOX-INGRESS` 或 Host 解析目标沙箱。
-- 自动监听目标 Namespace 内带有 `ingress-label-key` 标签的 Pod 列表，动态路由到单个可用实例，避免多实例冲突。
+- 基于 Kubernetes BatchSandbox CR 的 HTTP / WebSocket 反向代理，按 `OPEN-SANDBOX-INGRESS` 或 Host 解析目标沙箱。
+- 自动监听目标 Namespace 内的 BatchSandbox 资源，从 annotation 中获取端点 IP。
 - 提供 `/status.ok` 健康探针，启动时打印编译版本、时间、提交、Go/平台信息。
 
 ## 启动与参数
 ```bash
 go run main.go \
   --namespace <目标命名空间> \
-  --ingress-label-key <标签键> \
   --port 28888 \
   --log-level info
 ```
 - `--namespace`：监听的 Kubernetes 命名空间。
-- `--ingress-label-key`：用于匹配沙箱 Pod 的标签键。
 - `--port`：监听端口（默认 28888）。
 - `--log-level`：日志级别，遵循 zap 定义。
 
@@ -48,7 +46,7 @@ TAG=local VERSION=1.2.3 GIT_COMMIT=abc BUILD_TIME=2025-01-01T00:00:00Z bash buil
 
 ## 运行时依赖
 - 可访问的 Kubernetes API（集群内或 KUBECONFIG）。
-- 目标命名空间中按 `ingress-label-key` 标记的运行中 Pod，并确保 Pod IP 可直连。
+- 目标命名空间中的 BatchSandbox CR 必须包含 `sandbox.opensandbox.io/endpoints` annotation。
 
 ## 开发与测试
 ```bash
@@ -57,11 +55,16 @@ go test ./...
 ```
 主要代码位置：
 - `main.go`：入口与 HTTP 路由注册。
-- `pkg/proxy/`：HTTP/WebSocket 代理逻辑、Pod 监听、健康检查。
+- `pkg/proxy/`：HTTP/WebSocket 代理逻辑、沙箱端点解析。
+- `pkg/sandbox/`：沙箱 Provider 抽象和 BatchSandbox 实现。
 - `version/`：版本信息输出（ldflags 注入）。
 
 ## 常见行为说明
-- Header 优先：`OPEN-SANDBOX-INGRESS`，否则回退 Host 解析 `<ingress>-<port>.*`。
-- 多实例同 ingress 时返回 409；无可用 Pod 返回 404。
+- Header 优先：`OPEN-SANDBOX-INGRESS`，否则回退 Host 解析 `<sandbox-name>-<port>.*`。
+- 从请求中提取沙箱名称，查询 BatchSandbox CR 获取端点 IP。
+- 错误处理：
+  - `ErrSandboxNotFound`（沙箱资源不存在）→ HTTP 404
+  - `ErrSandboxNotReady`（副本数不足、缺少端点、配置无效）→ HTTP 503
+  - 其他错误（K8s API 错误等）→ HTTP 502
 - WebSocket 保留关键头并透传 X-Forwarded-*，HTTP 会移除 `OPEN-SANDBOX-INGRESS` 后再转发。
 

components/ingress/go.mod

@@ -3,15 +3,13 @@ module github.com/alibaba/opensandbox/ingress
 go 1.24.0
 
 require (
-	github.com/google/uuid v1.6.0
+	github.com/alibaba/OpenSandbox/sandbox-k8s v0.0.0
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/zap v1.27.1
-	k8s.io/api v0.34.3
 	k8s.io/apimachinery v0.34.3
 	k8s.io/client-go v0.34.3
-	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
-	knative.dev/pkg v0.0.0-20251217214024-80c8bc434670
+	knative.dev/pkg v0.0.0-20260120122510-4a022ed9999a
 )
 
 require (
@@ -29,6 +27,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -48,22 +47,27 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/net v0.49.0 // indirect
 	golang.org/x/oauth2 v0.32.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/sys v0.39.0 // indirect
-	golang.org/x/term v0.38.0 // indirect
-	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/term v0.39.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
 	golang.org/x/time v0.10.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.34.3 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
+	sigs.k8s.io/controller-runtime v0.21.0 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )
+
+replace github.com/alibaba/OpenSandbox/sandbox-k8s => ../../kubernetes

components/ingress/go.sum

@@ -64,10 +64,10 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
-github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
-github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
-github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
+github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
+github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw=
+github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -117,14 +117,14 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
-golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
+golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
+golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
+golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
 golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
 golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -135,22 +135,22 @@ golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
-golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
+golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
+golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
 golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
 golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
-golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
+golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
+golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -180,8 +180,10 @@ k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOP
 k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/pkg v0.0.0-20251217214024-80c8bc434670 h1:MKgHnTvNprMn+Tr73CRB088PqR22q4KuVFIBTLFltwA=
-knative.dev/pkg v0.0.0-20251217214024-80c8bc434670/go.mod h1:jU9OxeX3zL4W6aHpdMjMA/B7kgkm5JQv6PGMod2Qu/M=
+knative.dev/pkg v0.0.0-20260120122510-4a022ed9999a h1:9f29OTA7w/iVIX6PS6yveVVzNbcUS74eQfchVe8o2/4=
+knative.dev/pkg v0.0.0-20260120122510-4a022ed9999a/go.mod h1:Tz3GoxcNC5vH3Zo//cW3mnHL474u+Y1wbsUIZ11p8No=
+sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
+sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

components/ingress/main.go

@@ -19,44 +19,59 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"time"
 
 	"go.uber.org/zap/zapcore"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/kubernetes"
-	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/injection"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/signals"
 
 	"github.com/alibaba/opensandbox/ingress/pkg/flag"
 	"github.com/alibaba/opensandbox/ingress/pkg/proxy"
+	"github.com/alibaba/opensandbox/ingress/pkg/sandbox"
 	"github.com/alibaba/opensandbox/ingress/version"
 )
 
 func main() {
 	version.EchoVersion()
 
 	flag.InitFlags()
-	if flag.IngressLabelKey == "" || flag.Namespace == "" {
-		log.Panicf("'-ingress-label-key' and/or '-namespace' not set.")
+	if flag.Namespace == "" {
+		log.Panicf("'-namespace' not set.")
 	}
 
 	cfg := injection.ParseAndGetRESTConfigOrDie()
 	cfg.ContentType = runtime.ContentTypeProtobuf
 	cfg.UserAgent = "opensandbox-ingress/" + version.GitCommit
 
-	ctx := injection.WithNamespaceScope(signals.NewContext(), flag.Namespace)
+	ctx := signals.NewContext()
 	ctx = withLogger(ctx, flag.LogLevel)
 
-	clientset := kubernetes.NewForConfigOrDie(cfg)
-	ctx = context.WithValue(ctx, kubeclient.Key{}, clientset)
+	// Create sandbox provider factory
+	providerFactory := sandbox.NewProviderFactory(
+		cfg,
+		flag.Namespace,
+		time.Second*30, // resync period
+	)
 
-	reverseProxy := proxy.NewProxy(ctx)
+	// Create sandbox provider based on provider type
+	sandboxProvider, err := providerFactory.CreateProvider(flag.ProviderType)
+	if err != nil {
+		log.Panicf("Failed to create sandbox provider: %v", err)
+	}
+
+	// Start provider (includes cache sync)
+	if err := sandboxProvider.Start(ctx); err != nil {
+		log.Panicf("Failed to start sandbox provider: %v", err)
+	}
+
+	// Create reverse proxy with sandbox provider
+	reverseProxy := proxy.NewProxy(ctx, sandboxProvider)
 	http.Handle("/", reverseProxy)
 	http.HandleFunc("/status.ok", proxy.Healthz)
 
-	err := http.ListenAndServe(fmt.Sprintf(":%v", flag.Port), nil)
-	if err != nil {
+	if err := http.ListenAndServe(fmt.Sprintf(":%v", flag.Port), nil); err != nil {
 		log.Panicf("Error starting http server: %v", err)
 	}
 

components/ingress/pkg/flag/flags.go

@@ -21,9 +21,9 @@ var (
 	// Port controls the HTTP listener port.
 	Port int
 
-	// IngressLabelKey filters the target sandbox instances.
-	IngressLabelKey string
-
 	// Namespace filters the target sandbox instances.
 	Namespace string
+
+	// ProviderType specifies the sandbox provider type (e.g., batchsandbox).
+	ProviderType string
 )

components/ingress/pkg/flag/parser.go

@@ -22,8 +22,8 @@ import (
 func InitFlags() {
 	flag.StringVar(&LogLevel, "log-level", "info", "Server log level")
 	flag.IntVar(&Port, "port", 28888, "Server listening port (default: 28888)")
-	flag.StringVar(&IngressLabelKey, "ingress-label-key", "", "The Kubernetes label key used to identify sandbox instances for routing")
-	flag.StringVar(&Namespace, "namespace", "", "The Kubernetes namespace to watch for sandbox pods")
+	flag.StringVar(&Namespace, "namespace", "opensandbox", "The Kubernetes namespace to watch for sandbox resources")
+	flag.StringVar(&ProviderType, "provider-type", "batchsandbox", "The sandbox provider type (default: batchsandbox)")
 
 	// Parse flags - these will override environment variables if provided
 	flag.Parse()