fix: move sub2api runtime to PK01 host docker

2026-06-28 14:24:08 +00:00
parent 1d07df3df1
commit d225fd1a61
18 changed files with 1088 additions and 186 deletions
@@ -143,6 +143,15 @@ manualAccounts:
      kind: proxy
      provider: target-egress-proxy
      description: Bind a protected manual account to the selected target's YAML-declared egress proxy.
+    pk01-local-egress-proxy:
+      enabled: true
+      kind: proxy
+      provider: fixed-http-proxy
+      description: Bind a protected manual account to PK01 local provider-gateway egress.
+      fixedProxy:
+        protocol: http
+        host: 127.0.0.1
+        port: 18789
    unified-pool-group:
      enabled: true
      kind: group
@@ -153,8 +162,8 @@ manualAccounts:
      reason: Manually configured in Sub2API; keep outside UniDesk-managed Codex pool and sentinel control.
      proxyBinding:
        enabled: true
-        source: active-target-egress-proxy
-        proxyName: platform-infra-sub2api-egress-proxy
+        source: pk01-local-egress-proxy
+        proxyName: platform-infra-sub2api-pk01-local-egress-proxy
      groupBinding:
        enabled: true
        source: unified-pool-group
@@ -10,7 +10,7 @@ metadata:
    - 340

 defaults:
-  targetId: D601
+  targetId: PK01
  cleanup:
    externalDbState:
      postgresStatefulSetName: sub2api-postgres
@@ -69,9 +69,10 @@ targets:
          - kubernetes.default.svc
          - 127.0.0.1:5000
          - localhost:5000
-  - id: D601
-    route: D601:k3s
+  - id: PK01
+    route: PK01
    namespace: platform-infra
+    runtimeMode: host-docker
    role: active
    enabled: true
    databaseMode: external-active
@@ -79,59 +80,45 @@ targets:
    appReplicas: 1
    redisReplicas: 1
    image:
-      repository: 127.0.0.1:5000/platform-infra/sub2api
+      repository: docker.1panel.live/weishaw/sub2api
      tag: 0.1.138
      pullPolicy: IfNotPresent
    dependencyImages:
-      postgres: docker.m.daocloud.io/library/postgres:18-alpine
      redis: docker.m.daocloud.io/library/redis:8-alpine
-    codexPool:
-      sentinelImageBuild:
-        baseImageCachePolicy: local-if-present
-        noProxy:
-          - localhost
-          - 127.0.0.1
-          - ::1
-          - host.docker.internal
-          - 74.48.78.17
-          - 192.168.0.0/16
-          - 10.0.0.0/8
-          - 172.16.0.0/12
-          - 10.42.0.0/16
-          - 10.43.0.0/16
-          - .svc
-          - .svc.cluster.local
-          - .cluster.local
-          - kubernetes
-          - kubernetes.default
-          - kubernetes.default.svc
-          - 127.0.0.1:5000
-          - localhost:5000
+    hostDocker:
+      projectName: sub2api
+      workDir: /opt/unidesk/platform-infra/sub2api
+      composePath: /opt/unidesk/platform-infra/sub2api/docker-compose.yml
+      envPath: /opt/unidesk/platform-infra/sub2api/sub2api.env
+      appDataDir: /var/lib/unidesk/platform-infra/sub2api/data
+      appPort: 18080
+      redisPort: 16379
+      databaseHost: 127.0.0.1
+      databaseSslMode: require
+      noProxy:
+        - localhost
+        - 127.0.0.1
+        - ::1
+        - 10.0.0.0/8
+        - 172.16.0.0/12
+        - 192.168.0.0/16
+        - hyueapi.com
+        - .hyueapi.com
    publicExposure:
      enabled: true
+      mode: pk01-local
      publicBaseUrl: https://api.pikapython.com
      dns:
        hostname: api.pikapython.com
        expectedA: 82.156.23.220
        resolvers: [1.1.1.1, 8.8.8.8, 223.5.5.5, 114.114.114.114]
-      frpc:
-        deploymentName: sub2api-frpc
-        secretName: sub2api-frpc-secrets
-        secretKey: frpc.toml
-        image: 127.0.0.1:5000/hwlab/frpc:v0.68.1
-        serverAddr: 82.156.23.220
-        serverPort: 22000
-        proxyName: platform-infra-sub2api-d601-api
-        remotePort: 22098
-        localIP: sub2api.platform-infra.svc.cluster.local
-        localPort: 8080
-        tokenSourceRef: platform-infra/pk01-frp.env
-        tokenSourceKey: FRP_TOKEN
+      local:
+        upstreamHost: 127.0.0.1
+        upstreamPort: 18080
      pk01:
        route: PK01
        caddyBinaryPath: /usr/local/bin/caddy
        caddyDownloadUrl: https://caddyserver.com/api/download?os=linux&arch=amd64
-        caddyDownloadProxyUrl: http://127.0.0.1:18789
        caddyConfigPath: /etc/caddy/Caddyfile
        caddyServiceName: caddy
        caddyStorageDir: /var/lib/caddy
@@ -141,32 +128,15 @@ targets:
        pikanodeImage: pikanode
        pikanodeHttpHostPort: 18888
        responseHeaderTimeoutSeconds: 600
-    egressProxy:
-      enabled: true
-      deploymentName: sub2api-egress-proxy
-      serviceName: sub2api-egress-proxy
-      secretName: sub2api-egress-proxy-config
-      secretKey: config.json
-      image: 127.0.0.1:5000/platform-infra/sing-box:latest
-      imagePullPolicy: IfNotPresent
-      listenPort: 10808
-      hostNetwork: true
-      sourceConfigRef: config/platform-infra/egress-proxy-sources.yaml#sources.master-shadowsocks
-      applyToSub2Api: true
-      applyToSentinel: true
-      noProxy:
-        - localhost
-        - 127.0.0.1
-        - ::1
-        - .svc
-        - .cluster.local
-        - 10.0.0.0/8
-        - 172.16.0.0/12
-        - 192.168.0.0/16
-        - 82.156.23.220
-        - 74.48.78.17
-        - hyueapi.com
-        - .hyueapi.com
+  - id: D601
+    route: D601:k3s
+    namespace: platform-infra
+    role: retired
+    enabled: true
+    databaseMode: external-pending
+    redisMode: local-ephemeral
+    appReplicas: 0
+    redisReplicas: 0
  - id: D518
    route: D518:k3s
    namespace: platform-infra
@@ -289,8 +259,7 @@ runtime:
    mode: empty-dir
  sentinel:
    mode: singleton
-    enabledOnTargets:
-      - D601
+    enabledOnTargets: []
 security:
  urlAllowlist:
    enabled: false