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

feat: support named runtime lanes

Browse Source
This commit is contained in:
root
2026-07-15 16:47:05 +02:00
parent 0d9747fd5b
commit 6ee345168b
8 changed files with 458 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/src/gitops-render/core.mjs
+42 -22
View File
@@ -12,7 +12,11 @@ import {
applyRuntimeLaneDeployConfig,
defaultEndpointForRuntimeLane,
defaultPortForRuntimeLane,
isNamedRuntimeLane,
isRuntimeLane,
isVersionRuntimeLane,
runtimeNamespaceForRuntimeLane,
runtimeRelativePathForRuntimeLane,
runtimeLaneMirrorSpecs,
runtimeLaneConfig,
versionNameForRuntimeLane
@@ -245,7 +249,7 @@ function parseArgs(argv) {
else if (arg === "--help" || arg === "-h") args.help = true;
else throw new Error(`unknown argument ${arg}`);
}
if (isRuntimeLane(args.lane)) {
if (isVersionRuntimeLane(args.lane)) {
const versionName = versionNameForRuntimeLane(args.lane);
const defaultLaneEndpoint = defaultEndpointForRuntimeLane(args.lane);
if (args.sourceBranch === defaultBranch) args.sourceBranch = versionName;
@@ -261,7 +265,7 @@ function parseArgs(argv) {
if (!args.gitWriteUrl) args.gitWriteUrl = args.sourceRepo;
assert.ok(args.lane === "node" || isRuntimeLane(args.lane), `unknown lane ${args.lane}`);
assert.ok(["short", "full"].includes(args.imageTagMode), `unknown image tag mode ${args.imageTagMode}`);
if (isRuntimeLane(args.lane)) {
if (isVersionRuntimeLane(args.lane)) {
const versionName = versionNameForRuntimeLane(args.lane);
assert.equal(args.sourceBranch, versionName, `${args.lane} source branch must be ${versionName}`);
assert.equal(args.gitopsBranch, `${versionName}-gitops`, `${args.lane} GitOps branch must be ${versionName}-gitops`);
@@ -282,7 +286,7 @@ function usage() {
"Render node-scoped Kubernetes-native CI/CD manifests from built-in Tekton CI primitives, deploy/deploy.yaml, and deploy/k8s/*.",
"",
"options:",
" --lane LANE node or runtime lane such as v02/v03/v04; default: node",
" --lane LANE node or a deploy.lanes runtime lane id such as v02/v03/staging; default: node",
` --node NODE deployment node id from deploy.nodes; runtime lanes default from deploy.lanes.<lane>.node`,
` --out DIR default: ${defaultOutDir}`,
` --gitops-root DIR path inside GitOps repo; default comes from deploy.nodes.<node>.gitopsRoot`,
@@ -807,7 +811,7 @@ function isV02RemovedServiceId(serviceId) {
function artifactCatalogSkeleton({ args, deploy, source }) {
const environment = artifactEnvironment(args);
const namespace = isRuntimeLane(args.lane) ? namespaceNameForProfile(args.lane) : "hwlab-dev";
const namespace = isRuntimeLane(args.lane) ? namespaceNameForProfile(args.lane, deploy) : "hwlab-dev";
const tag = imageTagForSource(args, source);
return {
catalogVersion: "v1",
@@ -869,13 +873,13 @@ function artifactCatalogSkeletonService({ args, deploy, source, serviceId, envir
};
}
function namespaceNameForProfile(profile) {
if (isRuntimeLane(profile)) return `hwlab-${profile}`;
function namespaceNameForProfile(profile, deploy = null) {
if (isRuntimeLane(profile)) return runtimeNamespaceForRuntimeLane(deploy, profile);
return profile === "prod" ? "hwlab-prod" : "hwlab-dev";
}
function runtimePathForProfile(profile) {
if (isRuntimeLane(profile)) return `runtime-${profile}`;
function runtimePathForProfile(profile, deploy = null) {
if (isRuntimeLane(profile)) return runtimeRelativePathForRuntimeLane(deploy, profile);
return profile === "prod" ? "runtime-prod" : "runtime-dev";
}
@@ -892,8 +896,8 @@ function gitopsRootForArgs(args) {
return String(args.gitopsRoot || defaultOutDir).replace(/\/+$/u, "");
}
function gitopsPathForProfile(args, profile) {
return `${gitopsRootForArgs(args)}/${runtimePathForProfile(profile)}`;
function gitopsPathForProfile(args, profile, deploy = null) {
return `${gitopsRootForArgs(args)}/${runtimePathForProfile(profile, deploy)}`;
}
function gitopsPathFor(args, relativePath) {
@@ -911,9 +915,9 @@ function laneRuntimeProfiles(args) {
return isRuntimeLane(args.lane) ? [args.lane] : ["dev", "prod"];
}
function laneNames(args) {
function laneNames(args, deploy = null) {
if (isRuntimeLane(args.lane)) {
const namespace = namespaceNameForProfile(args.lane);
const namespace = namespaceNameForProfile(args.lane, deploy);
return {
gitopsTarget: args.lane,
pipeline: `${namespace}-ci-image-publish`,
@@ -922,7 +926,7 @@ function laneNames(args) {
serviceAccount: `${namespace}-tekton-runner`,
pipelineRunPrefix: `${namespace}-ci-poll-`,
runtimeNamespace: namespace,
runtimePath: gitopsPathForProfile(args, args.lane),
runtimePath: gitopsPathForProfile(args, args.lane, deploy),
argoApplications: [`argocd/hwlab-node-${args.lane}`]
};
}
@@ -1177,7 +1181,8 @@ function gitopsRootNodeId(gitopsRoot) {
}
function runtimeFrpConfigForProfile(deploy, profile, args = {}) {
const fallbackWebRemotePort = isRuntimeLane(profile) ? defaultPortForRuntimeLane(profile) : profile === "prod" ? 18666 : 17666;
const namedRuntimeLane = isNamedRuntimeLane(profile);
const fallbackWebRemotePort = isVersionRuntimeLane(profile) ? defaultPortForRuntimeLane(profile) : profile === "prod" ? 18666 : 17666;
const fallbackEdgeRemotePort = isRuntimeLane(profile) ? fallbackWebRemotePort + 1 : profile === "prod" ? 18667 : 17667;
const baseFrp = isRuntimeLane(profile) ? runtimeLaneConfig(deploy, profile)?.frp : deploy?.frp;
const nodeId = effectiveSecretPlaneNodeId(args);
@@ -1190,17 +1195,31 @@ function runtimeFrpConfigForProfile(deploy, profile, args = {}) {
.map((proxy) => [String(proxy.endpointId || proxy.name || ""), proxy]));
const proxyValue = (endpointId, key, fallback) => {
const value = proxyByEndpoint.get(endpointId)?.[key];
return typeof value === "string" && value.trim().length > 0 ? value.trim() : fallback;
if (typeof value === "string" && value.trim().length > 0) return value.trim();
assert.ok(!namedRuntimeLane, `deploy.lanes.${profile}.frp.proxies.${endpointId}.${key} is required`);
return fallback;
};
const proxyPort = (endpointId, fallback) => {
const value = proxyByEndpoint.get(endpointId)?.remotePort;
return Number.isInteger(value) ? value : fallback;
const proxyPort = (endpointId, fallback, key = "remotePort") => {
const value = proxyByEndpoint.get(endpointId)?.[key];
if (Number.isInteger(value) && value > 0) return value;
assert.ok(!namedRuntimeLane, `deploy.lanes.${profile}.frp.proxies.${endpointId}.${key} must be a positive integer`);
return fallback;
};
if (namedRuntimeLane) {
assert.ok(server && typeof server === "object" && !Array.isArray(server), `deploy.lanes.${profile}.frp.server is required`);
assert.ok(typeof server.address === "string" && server.address.trim().length > 0, `deploy.lanes.${profile}.frp.server.address is required`);
assert.ok(Number.isInteger(server.bindPort) && server.bindPort > 0, `deploy.lanes.${profile}.frp.server.bindPort must be a positive integer`);
for (const endpointId of ["frontend", "api"]) assert.ok(proxyByEndpoint.has(endpointId), `deploy.lanes.${profile}.frp.proxies must declare endpointId ${endpointId}`);
}
return {
serverAddr: typeof server?.address === "string" && server.address.trim().length > 0 ? server.address.trim() : "74.48.78.17",
serverPort: Number.isInteger(server?.bindPort) ? server.bindPort : 7000,
webRemotePort: proxyPort("frontend", fallbackWebRemotePort),
edgeRemotePort: proxyPort("api", fallbackEdgeRemotePort),
webLocalHost: proxyValue("frontend", "localHost", null),
edgeLocalHost: proxyValue("api", "localHost", null),
webLocalPort: proxyPort("frontend", 8080, "localPort"),
edgeLocalPort: proxyPort("api", 6667, "localPort"),
webProxyName: proxyValue("frontend", "name", null),
edgeProxyName: proxyValue("api", "name", null),
authSecretName: typeof frp?.auth?.secretName === "string" && frp.auth.secretName.trim().length > 0 ? frp.auth.secretName.trim() : null,
@@ -1347,7 +1366,7 @@ function workbenchRuntimeRedisConfigForProfile(deploy, profile) {
if (!redis || redis.enabled !== true) return null;
configObject(redis, label);
const namespace = requiredConfigString(redis, "namespace", label);
assert.equal(namespace, namespaceNameForProfile(profile), `${label}.namespace must match ${namespaceNameForProfile(profile)}`);
assert.equal(namespace, namespaceNameForProfile(profile, deploy), `${label}.namespace must match ${namespaceNameForProfile(profile, deploy)}`);
const serviceName = requiredConfigString(redis, "serviceName", label);
const image = requiredConfigString(redis, "image", label);
const port = requiredConfigPositiveInteger(redis, "port", label);
@@ -1446,7 +1465,7 @@ function upsertV02MetricsPort(service) {
function transformWorkloads({ workloads, deploy, catalog, source, sourceBranch = defaultBranch, gitReadUrl, registryPrefix, runtimeEndpoint, webEndpoint, profile = "dev", nodeId = "node", useDeployImages = false, metricsSidecarSha256 = null }) {
const result = cloneJson(workloads);
const deployServices = deployServicesForProfile(deploy, profile);
const namespace = namespaceNameForProfile(profile);
const namespace = namespaceNameForProfile(profile, deploy);
const profileLabel = runtimeLabelForProfile(profile);
const gitopsTarget = gitopsTargetForProfile(profile);
const runtimeLane = isRuntimeLane(profile);
@@ -1730,6 +1749,7 @@ function transformServices({ services, namespace, labels, annotations, profile =
function observabilityManifest({ deploy, profile, namespace, labels, annotations, metricsSidecarScript }) {
assert.ok(isRuntimeLane(profile), `observability profile must be a runtime lane, got ${profile}`);
const laneDisplayName = runtimeLaneConfig(deploy, profile).name ?? versionNameForRuntimeLane(profile);
const includePrometheusOperatorResources = runtimePrometheusOperatorResourcesEnabled(deploy, profile);
const baseLabels = {
...labels,
@@ -1785,7 +1805,7 @@ function observabilityManifest({ deploy, profile, namespace, labels, annotations
expr: `up{namespace="${namespace}"} == 0`,
for: "5m",
labels: { severity: "warning", lane: profile },
annotations: { summary: `HWLAB ${versionNameForRuntimeLane(profile)} metrics target is down`, description: `Prometheus cannot scrape a HWLAB ${versionNameForRuntimeLane(profile)} metrics target.` }
annotations: { summary: `HWLAB ${laneDisplayName} metrics target is down`, description: `Prometheus cannot scrape a HWLAB ${laneDisplayName} metrics target.` }
},
{
alert: `HWLAB${profile.toUpperCase()}ServiceHealthProbeFailed`,
@@ -1822,7 +1842,7 @@ export {
effectiveSecretPlaneNodeId, ensureObject, envReuseBootShForContainer, envReuseServiceIdsForLane,
generatedPath, gitopsPathFor, gitopsPathForProfile, gitopsRootForArgs, gitopsRootNodeId,
gitopsTargetForProfile, gitValue, imageFor, imageTagForSource,
imageTagFromReference, isRuntimeLane, isV02RemovedServiceId, jsonManifest,
imageTagFromReference, isNamedRuntimeLane, isRuntimeLane, isV02RemovedServiceId, jsonManifest,
k8sLabelHash, label, laneNames, laneRuntimeProfiles, mergeEnvMaps,
moonBridgeImage, moonBridgeSourceRef, namespaceNameForProfile, namespaceScopedHost,
normalizeAccessControlUser, normalizeNavProfile, normalizeProbeTiming,
scripts/src/gitops-render/runtime-manifests.mjs
+21 -20
View File
@@ -44,15 +44,16 @@ import {
versionNameForRuntimeLane
} from "./core.mjs";
function argoProject(args = { lane: "node" }) {
function argoProject(args = { lane: "node" }, deploy = null) {
if (isRuntimeLane(args.lane)) {
const namespace = namespaceNameForProfile(args.lane);
const namespace = namespaceNameForProfile(args.lane, deploy);
const laneName = runtimeLaneConfig(deploy, args.lane).name ?? versionNameForRuntimeLane(args.lane);
return {
apiVersion: "argoproj.io/v1alpha1",
kind: "AppProject",
metadata: { name: namespace, namespace: "argocd" },
spec: {
description: `HWLAB ${versionNameForRuntimeLane(args.lane)} additive GitOps project on target node; DEV/PROD remain outside this lane.`,
description: `HWLAB ${laneName} additive GitOps project on target node; DEV/PROD remain outside this lane.`,
sourceRepos: [args.gitReadUrl],
destinations: [{ server: "https://kubernetes.default.svc", namespace }],
clusterResourceWhitelist: [{ group: "", kind: "Namespace" }],
@@ -77,9 +78,9 @@ function argoProject(args = { lane: "node" }) {
};
}
function argoApplication(args, profile = "dev") {
const namespace = namespaceNameForProfile(profile);
const runtimePath = runtimePathForProfile(profile);
function argoApplication(args, profile = "dev", deploy = null) {
const namespace = namespaceNameForProfile(profile, deploy);
const runtimePath = runtimePathForProfile(profile, deploy);
const gitopsTarget = gitopsTargetForProfile(profile);
const project = isRuntimeLane(profile) ? namespace : "hwlab-node";
const repoURL = isRuntimeLane(profile) ? args.gitReadUrl : args.sourceRepo;
@@ -93,7 +94,7 @@ function argoApplication(args, profile = "dev") {
},
spec: {
project,
source: { repoURL, targetRevision: args.gitopsBranch, path: gitopsPathForProfile(args, profile) },
source: { repoURL, targetRevision: args.gitopsBranch, path: gitopsPathForProfile(args, profile, deploy) },
destination: { server: "https://kubernetes.default.svc", namespace },
syncPolicy: { automated: { prune: isRuntimeLane(profile), selfHeal: true }, syncOptions: ["CreateNamespace=true", "ApplyOutOfSyncOnly=true"] }
}
@@ -101,7 +102,7 @@ function argoApplication(args, profile = "dev") {
}
function nodeFrpcManifest({ profile = "dev", source = null, deploy = null, args = {} } = {}) {
const namespace = namespaceNameForProfile(profile);
const namespace = namespaceNameForProfile(profile, deploy);
const profileLabel = runtimeLabelForProfile(profile);
const deploymentName = isRuntimeLane(profile) ? `hwlab-${profile}-frpc` : profile === "prod" ? "hwlab-node-prod-frpc" : "hwlab-node-frpc";
const configName = `${deploymentName}-config`;
@@ -131,15 +132,15 @@ ${authConfigText}
[[proxies]]
name = "${webProxyName}"
type = "tcp"
localIP = "hwlab-cloud-web.${namespace}.svc.cluster.local"
localPort = 8080
localIP = "${frpConfig.webLocalHost || `hwlab-cloud-web.${namespace}.svc.cluster.local`}"
localPort = ${frpConfig.webLocalPort}
remotePort = ${frpConfig.webRemotePort}
[[proxies]]
name = "${edgeProxyName}"
type = "tcp"
localIP = "hwlab-edge-proxy.${namespace}.svc.cluster.local"
localPort = 6667
localIP = "${frpConfig.edgeLocalHost || `hwlab-edge-proxy.${namespace}.svc.cluster.local`}"
localPort = ${frpConfig.edgeLocalPort}
remotePort = ${frpConfig.edgeRemotePort}
`;
const configSha256 = createHash("sha256").update(configText).digest("hex");
@@ -194,7 +195,7 @@ remotePort = ${frpConfig.edgeRemotePort}
}
function deepSeekProxyManifest({ profile = "dev", source, sourceBranch = defaultBranch, sourceRepo = defaultSourceRepo, gitReadUrl, deploy = null, registryPrefix = defaultRegistryPrefix, catalog = null, useDeployImages = false, metricsSidecarSha256 = null } = {}) {
const namespace = namespaceNameForProfile(profile);
const namespace = namespaceNameForProfile(profile, deploy);
const bridgeServiceId = "hwlab-cloud-api";
const runtimeLane = isRuntimeLane(profile);
const digestPin = runtimeLane;
@@ -642,8 +643,8 @@ function runtimePostgresImageForProfile(deploy, profile) {
return typeof image === "string" && image.trim().length > 0 ? image.trim() : "postgres:16-alpine";
}
function v02PostgresManifest({ profile = "v02", migrationSources, source, image = "postgres:16-alpine" }) {
const namespace = namespaceNameForProfile(profile);
function v02PostgresManifest({ profile = "v02", migrationSources, source, image = "postgres:16-alpine", deploy = null }) {
const namespace = namespaceNameForProfile(profile, deploy);
const name = `${namespace}-postgres`;
const dbName = `hwlab_${profile}`;
const labels = {
@@ -738,8 +739,8 @@ function externalPostgresConfigForLane(deploy, profile, args = {}) {
return { serviceName: effective.serviceName, endpointAddress: effective.endpointAddress, port };
}
function externalPostgresManifest({ profile = "v03", config, source }) {
const namespace = namespaceNameForProfile(profile);
function externalPostgresManifest({ profile = "v03", config, source, deploy = null }) {
const namespace = namespaceNameForProfile(profile, deploy);
const labels = {
"app.kubernetes.io/name": config.serviceName,
"app.kubernetes.io/part-of": "hwlab",
@@ -772,8 +773,8 @@ function externalPostgresManifest({ profile = "v03", config, source }) {
};
}
function v02OpenFgaManifest({ profile = "v02", source }) {
const namespace = namespaceNameForProfile(profile);
function v02OpenFgaManifest({ profile = "v02", source, deploy = null }) {
const namespace = namespaceNameForProfile(profile, deploy);
const name = "hwlab-openfga";
const image = "127.0.0.1:5000/hwlab/openfga:v1.17.0";
const labels = {
@@ -1200,7 +1201,7 @@ function opencodeConfigContent(config) {
function opencodeServerManifest({ profile = "v03", source, deploy = null, catalog = null, registryPrefix = defaultRegistryPrefix, useDeployImages = false, sourceBranch = defaultBranch, gitReadUrl = defaultV02GitReadUrl, sourceRepo = defaultSourceRepo }) {
assert.ok(isRuntimeLane(profile), `opencode-server profile must be a runtime lane, got ${profile}`);
const namespace = namespaceNameForProfile(profile);
const namespace = namespaceNameForProfile(profile, deploy);
const name = "opencode-server";
const helperServiceId = "hwlab-cloud-web";
const envReuseServiceIds = envReuseServiceIdsForLane(deploy, profile);
scripts/src/gitops-render/tekton-manifests.mjs
+14 -14
View File
@@ -29,10 +29,10 @@ import {
primitiveValidationTaskNames
} from "./tekton-scripts.mjs";
function ciLaneSettings(argsOrLane = "node") {
function ciLaneSettings(argsOrLane = "node", deploy = null) {
const lane = typeof argsOrLane === "string" ? argsOrLane : argsOrLane.lane;
if (isRuntimeLane(lane)) {
const namespace = namespaceNameForProfile(lane);
const namespace = namespaceNameForProfile(lane, deploy);
return {
lane,
profile: lane,
@@ -64,8 +64,8 @@ function ciLaneSettings(argsOrLane = "node") {
};
}
function tektonRbac(args = { lane: "node" }) {
const settings = ciLaneSettings(args);
function tektonRbac(args = { lane: "node" }, deploy = null) {
const settings = ciLaneSettings(args, deploy);
if (isRuntimeLane(settings.lane)) {
const runtimeObserverName = `${settings.runtimeNamespace}-runtime-observer`;
const pipelineRunWriterName = `${settings.runtimeNamespace}-pipelinerun-writer`;
@@ -435,7 +435,7 @@ node scripts/ci/runtime-ready.mjs
`;
}
function runtimeReadyTask({ profile = "dev" } = {}) {
function runtimeReadyTask({ profile = "dev", deploy = null } = {}) {
return {
name: "runtime-ready",
runAfter: ["gitops-promote"],
@@ -457,7 +457,7 @@ function runtimeReadyTask({ profile = "dev" } = {}) {
},
params: [
{ name: "revision", value: "$(params.revision)" },
{ name: "runtime-namespace", value: namespaceNameForProfile(profile) },
{ name: "runtime-namespace", value: namespaceNameForProfile(profile, deploy) },
{ name: "gitops-target", value: gitopsTargetForProfile(profile) },
{ name: "argo-application", value: argoApplicationName(profile) },
{ name: "timeout-ms", value: "$(params.runtime-ready-timeout-ms)" }
@@ -478,12 +478,12 @@ function imagePublishTaskSet(args = { lane: "node" }, deploy = null) {
}
function tektonPipeline(args = { lane: "node" }, deploy = null) {
const settings = ciLaneSettings(args);
const runtimePath = gitopsPathForProfile(args, settings.profile);
const settings = ciLaneSettings(args, deploy);
const runtimePath = gitopsPathForProfile(args, settings.profile, deploy);
const preFlushRuntimeReadyTasks = isRuntimeLane(settings.lane)
? []
: [{
...runtimeReadyTask({ profile: settings.profile }),
...runtimeReadyTask({ profile: settings.profile, deploy }),
when: [{ input: "$(tasks.gitops-promote.results.runtime-ready-required)", operator: "in", values: ["true"] }]
}];
return {
@@ -607,9 +607,9 @@ function tektonPipeline(args = { lane: "node" }, deploy = null) {
};
}
function tektonPipelineRunTemplate({ source, args }) {
const settings = ciLaneSettings(args);
const runtimePath = gitopsPathForProfile(args, settings.profile);
function tektonPipelineRunTemplate({ source, args, deploy = null }) {
const settings = ciLaneSettings(args, deploy);
const runtimePath = gitopsPathForProfile(args, settings.profile, deploy);
return {
apiVersion: "tekton.dev/v1",
kind: "PipelineRun",
@@ -656,7 +656,7 @@ function tektonPipelineRunTemplate({ source, args }) {
}
function tektonPollerCronJob(args, deploy) {
const settings = ciLaneSettings(args);
const settings = ciLaneSettings(args, deploy);
if (settings.lane === "v02") throw new Error("v02 CI/CD is manually triggered by UniDesk CLI and must not render a branch poller CronJob");
return {
apiVersion: "batch/v1",
@@ -707,7 +707,7 @@ function tektonPollerCronJob(args, deploy) {
{ name: "LANE", value: settings.lane },
{ name: "CATALOG_PATH", value: args.catalogPath || settings.catalogPath },
{ name: "IMAGE_TAG_MODE", value: args.imageTagMode || settings.imageTagMode },
{ name: "RUNTIME_PATH", value: gitopsPathForProfile(args, settings.profile) },
{ name: "RUNTIME_PATH", value: gitopsPathForProfile(args, settings.profile, deploy) },
{ name: "GIT_URL", value: args.sourceRepo },
{ name: "GIT_READ_URL", value: args.gitReadUrl },
{ name: "SOURCE_BRANCH", value: args.sourceBranch },