fix: restore code queue native topology

2026-05-16 18:28:43 +00:00
parent c13f7b093c
commit 28f5b9006a
11 changed files with 26 additions and 284 deletions
@@ -174,7 +174,7 @@ export function K3sCtlPage({ microservices, onRaw, apiBaseUrl, onNavigate }: Any
      h("div", { className: "k3s-hero" },
        h("div", { className: "k3s-orb", "aria-hidden": "true" }, h("span", null, "k3s")),
        h("div", { className: "k3s-hero-copy" },
-          h("p", { className: "eyebrow" }, "D601 control plane / D518 managed node"),
+          h("p", { className: "eyebrow" }, "D601 native control plane"),
          h("h2", null, "UniDesk 只管理 adapter；业务微服务交给 k3s 标准服务路由"),
          h("p", { className: "muted paragraph" }, "Code Queue 的前端/API 请求进入 k3sctl-adapter，再由 adapter 转发到 k3s active service。provider-gateway 只用于维护 adapter 和节点诊断，不再直接管理 Code Queue 容器。"),
          h("div", { className: "k3s-route-strip" },
@@ -210,7 +210,7 @@ export function K3sCtlPage({ microservices, onRaw, apiBaseUrl, onNavigate }: Any
      state.refreshedAt ? h("p", { className: "muted paragraph" }, `最近刷新 ${fmtClock(state.refreshedAt)}`) : null,
    ),
    services.length === 0
-      ? h(Panel, { title: "代管服务", eyebrow: "k3s services", loading: state.loading }, h(EmptyState, { title: "暂无 k3s 服务", text: "等待 k3sctl-adapter 返回 /api/services；Code Queue 切换后这里应显示 D601 和 D518 两个实例。" }))
+      ? h(Panel, { title: "代管服务", eyebrow: "k3s services", loading: state.loading }, h(EmptyState, { title: "暂无 k3s 服务", text: "等待 k3sctl-adapter 返回 /api/services；Code Queue 应显示 D601 scheduler/read/write 服务实例。" }))
      : services.map((service) => renderManagedService(service, onRaw)),
  );
 }
@@ -21,8 +21,7 @@
      "activeInstanceId": "D601",
      "singleWriter": true,
      "expectedNodeIds": [
-        "D601",
-        "D518"
+        "D601"
      ],
      "instances": [
        {
@@ -32,14 +31,6 @@
          "baseUrl": "kubernetes://unidesk/services/code-queue-scheduler:4222",
          "healthPath": "/health",
          "healthMode": "service-proxy"
-        },
-        {
-          "id": "D518",
-          "nodeId": "D518",
-          "role": "standby",
-          "baseUrl": "kubernetes://unidesk/services/code-queue-d518:4222",
-          "healthPath": "/health",
-          "healthMode": "pod-ready"
        }
      ],
      "requireAllInstancesHealthy": false
@@ -1128,253 +1128,3 @@ spec:
    - name: http
      port: 4222
      targetPort: http
-
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: code-queue-d518
-  namespace: unidesk
-  labels:
-    app.kubernetes.io/name: code-queue
-    app.kubernetes.io/part-of: unidesk
-    unidesk.ai/deployment-mode: k3sctl-managed
-    unidesk.ai/instance-id: D518
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: code-queue
-      unidesk.ai/instance-id: D518
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: code-queue
-        app.kubernetes.io/part-of: unidesk
-        unidesk.ai/deployment-mode: k3sctl-managed
-        unidesk.ai/instance-id: D518
-        unidesk.ai/node-id: D518
-    spec:
-      nodeSelector:
-        unidesk.ai/node-id: D518
-      terminationGracePeriodSeconds: 30
-      containers:
-        - name: code-queue
-          image: unidesk-code-queue:d601
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 4222
-          envFrom:
-            - secretRef:
-                name: code-queue-env
-                optional: true
-          env:
-            - name: HOST
-              value: "0.0.0.0"
-            - name: PORT
-              value: "4222"
-            - name: DATABASE_URL
-              value: "postgres://unidesk:unidesk_dev_password@d601-tcp-egress-gateway.unidesk.svc.cluster.local:15432/unidesk"
-            - name: CODE_QUEUE_INSTANCE_ID
-              value: "D518"
-            - name: CODE_QUEUE_SERVICE_ROLE
-              value: "read"
-            - name: CODE_QUEUE_SCHEDULER_ENABLED
-              value: "false"
-            - name: CODE_QUEUE_STARTUP_OA_BACKFILL_ENABLED
-              value: "false"
-            - name: CODE_QUEUE_DATA_DIR
-              value: "/var/lib/unidesk/code-queue"
-            - name: CODE_QUEUE_WORKDIR
-              value: "/workspace"
-            - name: CODE_QUEUE_CODEX_HOME
-              value: "/var/lib/unidesk/code-queue/codex-home"
-            - name: CODE_QUEUE_OPENCODE_XDG_DIR
-              value: "/var/lib/unidesk/code-queue/opencode-xdg"
-            - name: CODE_QUEUE_SOURCE_CODEX_CONFIG
-              value: "/root/.codex/config.toml"
-            - name: CODE_QUEUE_DEFAULT_MODEL
-              value: "gpt-5.5"
-            - name: CODE_QUEUE_MODELS
-              value: "gpt-5.5,gpt-5.4-mini,gpt-5.4,minimax-m2.7"
-            - name: CODE_QUEUE_MODEL_REASONING_EFFORTS
-              value: "gpt-5.5=xhigh"
-            - name: CODE_QUEUE_SANDBOX
-              value: "danger-full-access"
-            - name: CODE_QUEUE_APPROVAL_POLICY
-              value: "never"
-            - name: CODE_QUEUE_MAX_ACTIVE_QUEUES
-              value: "0"
-            - name: CODE_QUEUE_DATABASE_POOL_MAX
-              value: "2"
-            - name: NODE_OPTIONS
-              value: "--max-old-space-size=1024"
-            - name: GIT_CONFIG_COUNT
-              value: "1"
-            - name: GIT_CONFIG_KEY_0
-              value: "safe.directory"
-            - name: GIT_CONFIG_VALUE_0
-              value: "*"
-            - name: CODE_QUEUE_IN_MEMORY_OUTPUT_RECORDS
-              value: "10"
-            - name: CODE_QUEUE_IN_MEMORY_EVENT_RECORDS
-              value: "10"
-            - name: CODE_QUEUE_MAIN_PROVIDER_ID
-              value: "D518"
-            - name: CODE_QUEUE_REMOTE_WORKDIR
-              value: "/home/ubuntu"
-            - name: CODE_QUEUE_EXECUTION_PROVIDER_IDS
-              value: "D518"
-            - name: CODE_QUEUE_DEV_CONTAINER_MASTER_HOST
-              value: "74.48.78.17"
-            - name: CODE_QUEUE_DEV_CONTAINER_DEFAULT_PROVIDER_ID
-              value: "D518"
-            - name: CODE_QUEUE_DEV_CONTAINER_WORKDIR
-              value: "/home/ubuntu"
-            - name: CODE_QUEUE_EGRESS_PROXY_ENABLED
-              value: "false"
-            - name: CODE_QUEUE_EGRESS_PROXY_URL
-              value: ""
-            - name: CODE_QUEUE_EGRESS_PROXY_NO_PROXY
-              value: "localhost,127.0.0.1,::1,host.docker.internal,d601-tcp-egress-gateway,d601-tcp-egress-gateway.unidesk,d601-tcp-egress-gateway.unidesk.svc,d601-tcp-egress-gateway.unidesk.svc.cluster.local,backend-core,oa-event-flow,database"
-            - name: HTTP_PROXY
-              value: ""
-            - name: HTTPS_PROXY
-              value: ""
-            - name: ALL_PROXY
-              value: ""
-            - name: http_proxy
-              value: ""
-            - name: https_proxy
-              value: ""
-            - name: all_proxy
-              value: ""
-            - name: NO_PROXY
-              value: "localhost,127.0.0.1,::1,host.docker.internal,d601-tcp-egress-gateway,d601-tcp-egress-gateway.unidesk,d601-tcp-egress-gateway.unidesk.svc,d601-tcp-egress-gateway.unidesk.svc.cluster.local,backend-core,oa-event-flow,database"
-            - name: no_proxy
-              value: "localhost,127.0.0.1,::1,host.docker.internal,d601-tcp-egress-gateway,d601-tcp-egress-gateway.unidesk,d601-tcp-egress-gateway.unidesk.svc,d601-tcp-egress-gateway.unidesk.svc.cluster.local,backend-core,oa-event-flow,database"
-            - name: OA_EVENT_FLOW_BASE_URL
-              value: "http://d601-tcp-egress-gateway.unidesk.svc.cluster.local:4255"
-            - name: CODE_QUEUE_NOTIFY_CLAUDEQQ_ENABLED
-              value: "false"
-            - name: CODE_QUEUE_NOTIFY_CLAUDEQQ_BASE_URL
-              value: ""
-            - name: CODE_QUEUE_NOTIFY_CLAUDEQQ_TARGET_TYPE
-              value: "private"
-            - name: CODE_QUEUE_NOTIFY_CLAUDEQQ_USER_ID
-              value: "645275593"
-            - name: CODE_QUEUE_NOTIFY_CLAUDEQQ_MAX_RESPONSE_CHARS
-              value: "12000"
-            - name: CODE_QUEUE_NOTIFY_CLAUDEQQ_TIMEOUT_MS
-              value: "15000"
-            - name: CODE_QUEUE_NOTIFY_CLAUDEQQ_SEND_ATTEMPTS
-              value: "3"
-            - name: LOG_FILE
-              value: "/var/log/unidesk/code-queue-d518.jsonl"
-            - name: UNIDESK_LOG_RETENTION_BYTES
-              value: "1GiB"
-          volumeMounts:
-            - name: docker-sock
-              mountPath: /var/run/docker.sock
-            - name: workspace
-              mountPath: /workspace
-            - name: workspace
-              mountPath: /home/ubuntu
-            - name: repo
-              mountPath: /root/unidesk
-            - name: repo
-              mountPath: /app
-            - name: codex-config
-              mountPath: /root/.codex/config.toml
-              readOnly: true
-            - name: codex-auth
-              mountPath: /root/.codex/auth.json
-              readOnly: true
-            - name: ssh-dir
-              mountPath: /root/.ssh
-              readOnly: true
-            - name: logs
-              mountPath: /var/log/unidesk
-            - name: state
-              mountPath: /var/lib/unidesk/code-queue
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: http
-            periodSeconds: 5
-            timeoutSeconds: 3
-            failureThreshold: 20
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: http
-            periodSeconds: 10
-            timeoutSeconds: 3
-            failureThreshold: 6
-          startupProbe:
-            httpGet:
-              path: /health
-              port: http
-            periodSeconds: 5
-            timeoutSeconds: 3
-            failureThreshold: 60
-          resources:
-            requests:
-              cpu: 250m
-              memory: 512Mi
-            limits:
-              memory: 4Gi
-      volumes:
-        - name: docker-sock
-          hostPath:
-            path: /var/run/docker.sock
-            type: Socket
-        - name: workspace
-          hostPath:
-            path: /home/ubuntu
-            type: Directory
-        - name: repo
-          hostPath:
-            path: /home/ubuntu/cq-deploy
-            type: Directory
-        - name: codex-config
-          hostPath:
-            path: /home/ubuntu/.codex/config.toml
-            type: File
-        - name: codex-auth
-          hostPath:
-            path: /home/ubuntu/.codex/auth.json
-            type: File
-        - name: ssh-dir
-          hostPath:
-            path: /home/ubuntu/.ssh
-            type: Directory
-        - name: logs
-          hostPath:
-            path: /home/ubuntu/cq-deploy/.state/code-queue/logs
-            type: DirectoryOrCreate
-        - name: state
-          hostPath:
-            path: /home/ubuntu/cq-deploy/.state/code-queue
-            type: DirectoryOrCreate
---
-apiVersion: v1
-kind: Service
-metadata:
-  name: code-queue-d518
-  namespace: unidesk
-  labels:
-    app.kubernetes.io/name: code-queue
-    app.kubernetes.io/part-of: unidesk
-    unidesk.ai/deployment-mode: k3sctl-managed
-    unidesk.ai/instance-id: D518
-spec:
-  type: ClusterIP
-  selector:
-    app.kubernetes.io/name: code-queue
-    unidesk.ai/instance-id: D518
-  ports:
-    - name: http
-      port: 4222
-      targetPort: http