refactor: variableize yaml lane node naming
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { readFileSync } from "node:fs";
|
||||
import { runCommand } from "./command";
|
||||
import { repoRoot, rootPath } from "./config";
|
||||
import { d601K3sGuardShellLines, d601NativeKubeconfig } from "./d601-k3s-guard";
|
||||
import { k3sGuardShellLines, defaultNativeKubeconfig } from "./k3s-target-guard";
|
||||
import { startJob } from "./jobs";
|
||||
|
||||
const defaultManifest = "src/components/microservices/k3sctl-adapter/k3s/dev/unidesk-dev-foundation.k8s.yaml";
|
||||
@@ -217,8 +217,8 @@ function validateDatabaseUrl(url: string): { ok: boolean; url: string; reason: s
|
||||
}
|
||||
|
||||
function kubectlDryRun(manifestPath: string): unknown {
|
||||
const kubeconfig = d601NativeKubeconfig;
|
||||
const guardScript = d601K3sGuardShellLines(kubeconfig).join("\n");
|
||||
const kubeconfig = defaultNativeKubeconfig;
|
||||
const guardScript = k3sGuardShellLines(kubeconfig).join("\n");
|
||||
const guard = runCommand(["sh", "-lc", guardScript], repoRoot, {
|
||||
timeoutMs: 60_000,
|
||||
env: { ...process.env, KUBECONFIG: kubeconfig },
|
||||
@@ -283,7 +283,7 @@ function prewarmImagesScript(options: PrewarmImagesOptions): string {
|
||||
`pull_missing=${options.pullMissing ? "1" : "0"}`,
|
||||
`pull_timeout_seconds=${pullTimeoutSeconds}`,
|
||||
"ctr_address=/run/k3s/containerd/containerd.sock",
|
||||
...d601K3sGuardShellLines(),
|
||||
...k3sGuardShellLines(),
|
||||
"export DOCKER_CONFIG=/tmp/unidesk-dev-env-docker-config",
|
||||
"mkdir -p \"$DOCKER_CONFIG\"",
|
||||
"printf '{}\\n' > \"$DOCKER_CONFIG/config.json\"",
|
||||
|
||||
Reference in New Issue
Block a user