feat: deploy sub2api api2 on jd01

config/platform-db/postgres-pk01.yaml

@@ -93,6 +93,9 @@ postgres:
         - id: D518-public
           cidr: 202.98.13.68/32
           purpose: platform-infra-sub2api-active
+        - id: JD01-public
+          cidr: 117.72.122.178/32
+          purpose: platform-infra-sub2api-active
   tuning:
     maxConnections: 160
     sharedBuffers: 512MB
@@ -153,6 +156,16 @@ postgres:
         user: sub2api
         address: 202.98.13.68/32
         method: scram-sha-256
+      - type: hostssl
+        database: sub2api
+        user: sub2api
+        address: 117.72.122.178/32
+        method: scram-sha-256
+      - type: hostssl
+        database: postgres
+        user: sub2api
+        address: 117.72.122.178/32
+        method: scram-sha-256
       - type: hostssl
         database: langbot
         user: langbot

config/platform-infra/sub2api.yaml

@@ -140,12 +140,12 @@ targets:
   - id: D518
     route: D518:k3s
     namespace: platform-infra
-    role: active
+    role: standby
     enabled: true
-    databaseMode: external-active
+    databaseMode: external-pending
     redisMode: local-ephemeral
-    appReplicas: 1
-    redisReplicas: 1
+    appReplicas: 0
+    redisReplicas: 0
     image:
       repository: weishaw/sub2api
       tag: 0.1.138
@@ -174,7 +174,7 @@ targets:
           - kubernetes.default
           - kubernetes.default.svc
     publicExposure:
-      enabled: true
+      enabled: false
       publicBaseUrl: https://api2.pikapython.com
       dns:
         hostname: api2.pikapython.com
@@ -208,7 +208,7 @@ targets:
         pikanodeHttpHostPort: 18888
         responseHeaderTimeoutSeconds: 600
     egressProxy:
-      enabled: true
+      enabled: false
       deploymentName: sub2api-egress-proxy
       serviceName: sub2api-egress-proxy
       secretName: sub2api-egress-proxy-config
@@ -218,8 +218,8 @@ targets:
       listenPort: 10808
       hostNetwork: true
       sourceConfigRef: config/platform-infra/egress-proxy-sources.yaml#sources.master-shadowsocks
-      applyToSub2Api: true
-      applyToSentinel: true
+      applyToSub2Api: false
+      applyToSentinel: false
       noProxy:
         - localhost
         - 127.0.0.1
@@ -238,8 +238,8 @@ targets:
     namespace: platform-infra
     role: active
     enabled: true
-    databaseMode: bundled
-    redisMode: bundled-persistent
+    databaseMode: external-active
+    redisMode: local-ephemeral
     appReplicas: 1
     redisReplicas: 1
     image:
@@ -271,8 +271,42 @@ targets:
           - kubernetes.default.svc
           - 127.0.0.1:5000
           - localhost:5000
+    publicExposure:
+      enabled: true
+      publicBaseUrl: https://api2.pikapython.com
+      dns:
+        hostname: api2.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: ghcr.io/fatedier/frpc:v0.68.1
+        serverAddr: 82.156.23.220
+        serverPort: 22000
+        proxyName: platform-infra-sub2api-jd01-api
+        remotePort: 22087
+        localIP: sub2api.platform-infra.svc.cluster.local
+        localPort: 8080
+        tokenSourceRef: platform-infra/pk01-frp.env
+        tokenSourceKey: FRP_TOKEN
+      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
+        caddyEmail: ops@pikapython.com
+        pikanodeRoot: /home/ubuntu/pikanode
+        pikanodeContainerName: pikanode
+        pikanodeImage: pikanode
+        pikanodeHttpHostPort: 18888
+        responseHeaderTimeoutSeconds: 600
     egressProxy:
-      enabled: false
+      enabled: true
       deploymentName: sub2api-egress-proxy
       serviceName: sub2api-egress-proxy
       secretName: sub2api-egress-proxy-config
@@ -284,8 +318,8 @@ targets:
       hostProxyConfigRef: config/platform-infra/host-proxy.yaml#targets.JD01
       proxyEnvPath: /etc/unidesk/proxy.env
       sourceConfigRef: config/platform-infra/egress-proxy-sources.yaml#sources.master-shadowsocks
-      applyToSub2Api: false
-      applyToSentinel: false
+      applyToSub2Api: true
+      applyToSentinel: true
       noProxy:
         - localhost
         - 127.0.0.1