fix: 收敛 HWLAB runtime GitOps ConfigMap ownership

2026-07-13 23:34:40 +02:00
parent 9833f5fd6b
commit 75e04b49e5
6 changed files with 128 additions and 27 deletions
@@ -4,6 +4,7 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { createRequire } from "node:module";
+import { runtimeGitopsScriptsConfigMap } from "./runtime-gitops-scripts-configmap.mjs";

 const requireFromScript = createRequire(import.meta.url);
 const requireFromCwd = createRequire(path.join(process.cwd(), "package.json"));
@@ -125,31 +126,9 @@ function ensureRuntimeGitopsScriptsMount(taskSpec, step) {

 function writeScriptsConfigMap(targetPath, namespace) {
  if (scriptsDir === null) throw new Error("--scripts-dir is required with --scripts-configmap");
-  const data = {
-    "runtime-gitops-overlay.json": `${JSON.stringify({
-      runtimePath: requiredOverlayString("runtimePath"),
-      observability: objectOr(overlay.observability),
-    })}\n`,
-  };
-  for (const name of ["runtime-gitops-observability.mjs", "runtime-gitops-postprocess.mjs", "runtime-gitops-verify.mjs"]) {
-    data[name] = readFileSync(path.join(scriptsDir, name), "utf8");
-  }
-  writeFileSync(targetPath, `${YAML.stringify({
-    apiVersion: "v1",
-    kind: "ConfigMap",
-    metadata: {
-      name: configMapName,
-      namespace,
-      labels: {
-        "app.kubernetes.io/name": "hwlab-runtime-gitops-scripts",
-        "app.kubernetes.io/part-of": "unidesk-hwlab-control-plane",
-        "hwlab.pikastech.local/node": overlay.nodeId ?? null,
-        "hwlab.pikastech.local/lane": overlay.lane ?? null,
-      },
-    },
-    data,
-  }).trimEnd()}\n`, "utf8");
-  return { name: configMapName, namespace, keyCount: Object.keys(data).length, path: targetPath };
+  const configMap = runtimeGitopsScriptsConfigMap({ overlay, scriptsDir, namespace, configMapName });
+  writeFileSync(targetPath, `${YAML.stringify(configMap).trimEnd()}\n`, "utf8");
+  return { name: configMapName, namespace, keyCount: Object.keys(configMap.data).length, path: targetPath };
 }

 function pipelineNamespace(docs) {
@@ -0,0 +1,39 @@
+import { readFileSync } from "node:fs";
+import path from "node:path";
+
+export function runtimeGitopsScriptsConfigMap({ overlay, scriptsDir, namespace, configMapName }) {
+  const data = {
+    "runtime-gitops-overlay.json": `${JSON.stringify({
+      runtimePath: requiredString(overlay.runtimePath, "overlay.runtimePath"),
+      observability: objectOr(overlay.observability),
+    })}\n`,
+  };
+  for (const name of ["runtime-gitops-observability.mjs", "runtime-gitops-postprocess.mjs", "runtime-gitops-verify.mjs"]) {
+    data[name] = readFileSync(path.join(scriptsDir, name), "utf8");
+  }
+  return {
+    apiVersion: "v1",
+    kind: "ConfigMap",
+    metadata: {
+      name: configMapName,
+      namespace,
+      labels: {
+        "app.kubernetes.io/name": "hwlab-runtime-gitops-scripts",
+        "app.kubernetes.io/part-of": "unidesk-hwlab-control-plane",
+        "app.kubernetes.io/managed-by": "unidesk-host-gitops",
+        "hwlab.pikastech.local/node": overlay.nodeId ?? null,
+        "hwlab.pikastech.local/lane": overlay.lane ?? null,
+      },
+    },
+    data,
+  };
+}
+
+function requiredString(value, pathLabel) {
+  if (typeof value !== "string" || value.length === 0) throw new Error(`${pathLabel} must be a non-empty string`);
+  return value;
+}
+
+function objectOr(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+}