refactor: variableize yaml lane node naming
This commit is contained in:
@@ -13,7 +13,7 @@ import { baiduNetdiskRuntimeSecretRequirements, runtimeSecretContractFromEnvText
|
||||
import { startJob } from "../jobs";
|
||||
import { coreInternalFetch } from "../microservices";
|
||||
import { codeQueueSourceImportPreflight, codeQueueSourceSubdir } from "../code-queue-source-guard";
|
||||
import { d601K3sGuardShellLines, d601NativeKubeconfig } from "../d601-k3s-guard";
|
||||
import { k3sGuardShellLines, defaultNativeKubeconfig } from "../k3s-target-guard";
|
||||
import { composeRuntimeEnvValue } from "../runtime-env";
|
||||
import {
|
||||
compareDeployJsonExecutorMirrors,
|
||||
@@ -29,7 +29,7 @@ import {
|
||||
} from "../deploy-json-contract";
|
||||
|
||||
import type { DeployManifestService } from "./types";
|
||||
import { d601K3sGuardScript, isUnideskRepo, providerSourceRepoUrl, safeId, shellQuote } from "./options";
|
||||
import { k3sTargetGuardScript, isUnideskRepo, providerSourceRepoUrl, safeId, shellQuote } from "./options";
|
||||
import { buildBaseImageFallbacks, buildCachePrelude, buildImageTag, devK3sPrepullImages, directBuildContextOverride, directComposeEnvFile, directComposeFile, directDockerfileOverride, k8sManifestPath, sourceBuildContext, sourceDockerfilePath, sourceFallbackWorktree, sourceProxyPrelude, sourceWorkDir, targetIsMain, targetRepoDir, targetWorkDir } from "./paths";
|
||||
import { isDevK3sDeployService, isDirectComposeDeployMode } from "./service-plan";
|
||||
import { k8sKubeconfig, nativeK3sCtrAddress, nativeK3sImage, nativeK3sInstallVersion, providerGatewayWsEgressProxyUrl } from "./types";
|
||||
@@ -50,7 +50,7 @@ export function syncDevFrontendAuthScript(config: UniDeskConfig): string {
|
||||
};
|
||||
return [
|
||||
"set -euo pipefail",
|
||||
d601K3sGuardScript(),
|
||||
k3sTargetGuardScript(),
|
||||
`secret_patch=${shellQuote(JSON.stringify({ data }))}`,
|
||||
`config_patch=${shellQuote(JSON.stringify({ data: runtimeConfig }))}`,
|
||||
`kubectl -n unidesk-dev patch secret unidesk-dev-runtime-secrets --type merge -p "$secret_patch"`,
|
||||
@@ -657,7 +657,7 @@ export function ensureNativeK3sScript(): string {
|
||||
` if KUBECONFIG=${shellQuote(k8sKubeconfig)} kubectl get nodes >/dev/null 2>&1; then break; fi`,
|
||||
" sleep 2",
|
||||
"done",
|
||||
d601K3sGuardScript(),
|
||||
k3sTargetGuardScript(),
|
||||
`KUBECONFIG=${shellQuote(k8sKubeconfig)} kubectl get nodes -l unidesk.ai/node-id=D601 --no-headers | grep -q .`,
|
||||
`KUBECONFIG=${shellQuote(k8sKubeconfig)} kubectl wait --for=condition=Ready node -l unidesk.ai/node-id=D601 --timeout=180s`,
|
||||
"install_system_images_from_legacy_k3s",
|
||||
|
||||
Reference in New Issue
Block a user