mirrors/pikasTech-HWLAB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2400 from pikasTech/fix/2393-jd01-runtime-readurl-postgres

Browse Source 
fix: use jd01 runtime git and postgres endpoints
This commit is contained in:
Lyon
2026-07-06 16:04:25 +08:00
committed by GitHub
parent 11bee7e5bb 6167368da0
commit 9ef1ae0768
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/pipelines/hwlab-jd01-v03-ci-image-publish.yaml
+1 -1
View File
@@ -24,7 +24,7 @@
{ {
"name": "git-read-url", "name": "git-read-url",
"type": "string", "type": "string",
"default": "http://git-mirror-http.devops-infra.svc.cluster.local/pikasTech/HWLAB.git" "default": "http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-HWLAB.git"
}, },
{ {
"name": "git-write-url", "name": "git-write-url",
deploy/deploy.yaml
+2 -2
View File
@@ -361,8 +361,8 @@ lanes:
- model-catalog.json - model-catalog.json
externalPostgres: externalPostgres:
enabled: true enabled: true
serviceName: g14-platform-postgres serviceName: jd01-pk01-platform-postgres
endpointAddress: 10.42.0.1 endpointAddress: 82.156.23.220
port: 5432 port: 5432
runtimeStore: runtimeStore:
postgres: postgres:
scripts/gitops-render.mjs
+1 -1
View File
@@ -27,7 +27,7 @@ const defaultSourceRepo = process.env.HWLAB_NODE_GIT_URL || "git@github.com:pika
const defaultGitReadUrl = process.env.HWLAB_NODE_GIT_READ_URL || null; const defaultGitReadUrl = process.env.HWLAB_NODE_GIT_READ_URL || null;
const defaultV02GitReadUrl = process.env.HWLAB_V02_GIT_READ_URL || "http://git-mirror-http.devops-infra.svc.cluster.local/pikasTech/HWLAB.git"; const defaultV02GitReadUrl = process.env.HWLAB_V02_GIT_READ_URL || "http://git-mirror-http.devops-infra.svc.cluster.local/pikasTech/HWLAB.git";
const defaultV02GitWriteUrl = process.env.HWLAB_V02_GIT_WRITE_URL || "http://git-mirror-write.devops-infra.svc.cluster.local/pikasTech/HWLAB.git"; const defaultV02GitWriteUrl = process.env.HWLAB_V02_GIT_WRITE_URL || "http://git-mirror-write.devops-infra.svc.cluster.local/pikasTech/HWLAB.git";
const defaultRuntimeLaneGitReadUrl = process.env.HWLAB_RUNTIME_LANE_GIT_READ_URL || defaultV02GitReadUrl; const defaultRuntimeLaneGitReadUrl = process.env.HWLAB_RUNTIME_LANE_GIT_READ_URL || "http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-HWLAB.git";
const defaultRuntimeLaneGitWriteUrl = process.env.HWLAB_RUNTIME_LANE_GIT_WRITE_URL || defaultV02GitWriteUrl; const defaultRuntimeLaneGitWriteUrl = process.env.HWLAB_RUNTIME_LANE_GIT_WRITE_URL || defaultV02GitWriteUrl;
const defaultBranch = process.env.HWLAB_NODE_BRANCH || "node"; const defaultBranch = process.env.HWLAB_NODE_BRANCH || "node";
const defaultGitopsBranch = process.env.HWLAB_NODE_GITOPS_BRANCH || "node-gitops"; const defaultGitopsBranch = process.env.HWLAB_NODE_GITOPS_BRANCH || "node-gitops";
scripts/gitops-render.test.ts
+2 -2
View File
@@ -650,8 +650,8 @@ test("v03 render keeps node identity as data instead of generated structure", as
const externalPostgres = JSON.parse(await readFile(path.join(outDir, "runtime-v03", "external-postgres.yaml"), "utf8")); const externalPostgres = JSON.parse(await readFile(path.join(outDir, "runtime-v03", "external-postgres.yaml"), "utf8"));
assert.deepEqual((externalPostgres.items ?? []).map((item) => item.kind), ["Service", "EndpointSlice"]); assert.deepEqual((externalPostgres.items ?? []).map((item) => item.kind), ["Service", "EndpointSlice"]);
const externalPostgresSlice = (externalPostgres.items ?? []).find((item) => item.kind === "EndpointSlice"); const externalPostgresSlice = (externalPostgres.items ?? []).find((item) => item.kind === "EndpointSlice");
assert.equal(externalPostgresSlice?.metadata?.name, "g14-platform-postgres-host"); assert.equal(externalPostgresSlice?.metadata?.name, "jd01-pk01-platform-postgres-host");
assert.equal(externalPostgresSlice?.metadata?.labels?.["kubernetes.io/service-name"], "g14-platform-postgres"); assert.equal(externalPostgresSlice?.metadata?.labels?.["kubernetes.io/service-name"], "jd01-pk01-platform-postgres");
const deepseekProxy = await readFile(path.join(outDir, "runtime-v03", "deepseek-proxy.yaml"), "utf8"); const deepseekProxy = await readFile(path.join(outDir, "runtime-v03", "deepseek-proxy.yaml"), "utf8");
const deepseekProxyJson = JSON.parse(deepseekProxy); const deepseekProxyJson = JSON.parse(deepseekProxy);
const metricsSidecarConfigMaps = [...(workloadsJson.items ?? []), ...(deepseekProxyJson.items ?? [])] const metricsSidecarConfigMaps = [...(workloadsJson.items ?? []), ...(deepseekProxyJson.items ?? [])]