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

Merge pull request #1545 from pikasTech/fix/1544-jd01-db-authority

Browse Source 
fix: restore JD01 local-k3s postgres render
This commit is contained in:
Lyon
2026-07-05 03:53:18 +08:00
committed by GitHub
parent cea5634022 9c8e120d3f
commit f35fde8f65
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/native/cicd/hwlab-node-control-plane-refresh.mjs
+2 -1
View File
@@ -102,10 +102,11 @@ function applyDeployOverlay() {
runtimePath: overlay.runtimePath, runtimePath: overlay.runtimePath,
imageTagMode: "full", imageTagMode: "full",
sourceRepo: overlay.gitUrl, sourceRepo: overlay.gitUrl,
externalPostgres: overlay.externalPostgres,
observability: overlay.observability, observability: overlay.observability,
envRecipe: { ...(lane.envRecipe || {}), downloadStack }, envRecipe: { ...(lane.envRecipe || {}), downloadStack },
}; };
if (overlay.externalPostgres === undefined || overlay.externalPostgres === null) delete doc.lanes[overlay.lane].externalPostgres;
else doc.lanes[overlay.lane].externalPostgres = overlay.externalPostgres;
if (overlay.runtimeStore !== undefined) doc.lanes[overlay.lane].runtimeStore = overlay.runtimeStore; if (overlay.runtimeStore !== undefined) doc.lanes[overlay.lane].runtimeStore = overlay.runtimeStore;
if (overlay.codeAgentRuntime !== undefined) doc.lanes[overlay.lane].codeAgentRuntime = overlay.codeAgentRuntime; if (overlay.codeAgentRuntime !== undefined) doc.lanes[overlay.lane].codeAgentRuntime = overlay.codeAgentRuntime;
if (overlay.deployYamlGitMirror !== undefined) doc.lanes[overlay.lane].gitMirror = overlay.deployYamlGitMirror; if (overlay.deployYamlGitMirror !== undefined) doc.lanes[overlay.lane].gitMirror = overlay.deployYamlGitMirror;
scripts/src/hwlab-node/render.ts
+4 -2
View File
@@ -1372,10 +1372,11 @@ export function renderNodeRuntimeControlPlaneOnNode(spec: HwlabRuntimeLaneSpec,
" runtimePath: overlay.runtimePath,", " runtimePath: overlay.runtimePath,",
" imageTagMode: 'full',", " imageTagMode: 'full',",
" sourceRepo: overlay.gitUrl,", " sourceRepo: overlay.gitUrl,",
" externalPostgres: overlay.externalPostgres,",
" observability: overlay.observability,", " observability: overlay.observability,",
" envRecipe: { ...(lane.envRecipe || {}), downloadStack },", " envRecipe: { ...(lane.envRecipe || {}), downloadStack },",
"};", "};",
"if (overlay.externalPostgres === undefined || overlay.externalPostgres === null) delete doc.lanes[overlay.lane].externalPostgres;",
"else doc.lanes[overlay.lane].externalPostgres = overlay.externalPostgres;",
"if (overlay.runtimeStore !== undefined) doc.lanes[overlay.lane].runtimeStore = overlay.runtimeStore;", "if (overlay.runtimeStore !== undefined) doc.lanes[overlay.lane].runtimeStore = overlay.runtimeStore;",
"if (overlay.codeAgentRuntime !== undefined) doc.lanes[overlay.lane].codeAgentRuntime = overlay.codeAgentRuntime;", "if (overlay.codeAgentRuntime !== undefined) doc.lanes[overlay.lane].codeAgentRuntime = overlay.codeAgentRuntime;",
"if (overlay.deployYamlGitMirror !== undefined) doc.lanes[overlay.lane].gitMirror = overlay.deployYamlGitMirror;", "if (overlay.deployYamlGitMirror !== undefined) doc.lanes[overlay.lane].gitMirror = overlay.deployYamlGitMirror;",
@@ -1519,10 +1520,11 @@ export function nodeRuntimePipelinePostprocessScript(): string[] {
" runtimePath: overlay.runtimePath,", " runtimePath: overlay.runtimePath,",
" imageTagMode: 'full',", " imageTagMode: 'full',",
" sourceRepo: overlay.gitUrl,", " sourceRepo: overlay.gitUrl,",
" externalPostgres: overlay.externalPostgres,",
" observability: overlay.observability,", " observability: overlay.observability,",
" envRecipe: { ...envRecipe, downloadStack },", " envRecipe: { ...envRecipe, downloadStack },",
"};", "};",
"if (overlay.externalPostgres === undefined || overlay.externalPostgres === null) delete doc.lanes[overlay.lane].externalPostgres;",
"else doc.lanes[overlay.lane].externalPostgres = overlay.externalPostgres;",
"if (overlay.runtimeStore !== undefined) doc.lanes[overlay.lane].runtimeStore = overlay.runtimeStore;", "if (overlay.runtimeStore !== undefined) doc.lanes[overlay.lane].runtimeStore = overlay.runtimeStore;",
"if (overlay.codeAgentRuntime !== undefined) doc.lanes[overlay.lane].codeAgentRuntime = overlay.codeAgentRuntime;", "if (overlay.codeAgentRuntime !== undefined) doc.lanes[overlay.lane].codeAgentRuntime = overlay.codeAgentRuntime;",
"if (overlay.deployYamlGitMirror !== undefined) doc.lanes[overlay.lane].gitMirror = overlay.deployYamlGitMirror;", "if (overlay.deployYamlGitMirror !== undefined) doc.lanes[overlay.lane].gitMirror = overlay.deployYamlGitMirror;",