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

fix(v03): keep cloud api available during rollout (#2000)

Browse Source
This commit is contained in:
Lyon
2026-06-24 01:22:11 +08:00
committed by GitHub
parent b2b6d200fc
commit 0a8da60bd9
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/deploy.yaml
+1
View File
@@ -561,6 +561,7 @@ lanes:
overrides: {} overrides: {}
services: services:
- serviceId: hwlab-cloud-api - serviceId: hwlab-cloud-api
replicas: 2
env: env:
HWLAB_CLOUD_DB_URL: secretRef:hwlab-cloud-api-v03-db/database-url HWLAB_CLOUD_DB_URL: secretRef:hwlab-cloud-api-v03-db/database-url
HWLAB_CLOUD_DB_CONTRACT: v03-redacted-presence-only HWLAB_CLOUD_DB_CONTRACT: v03-redacted-presence-only
scripts/gitops-render.mjs
+12 -2
View File
@@ -914,7 +914,7 @@ function removeV02LegacySimulatorEnv(envList) {
return envList.filter((entry) => !v02RemovedServiceEnvNames.has(entry?.name)); return envList.filter((entry) => !v02RemovedServiceEnvNames.has(entry?.name));
} }
function removeV02RepoOwnedCodeAgentPodConfig(podSpec) { function removeV02RepoOwnedCodeAgentPodConfig(deploymentSpec, podSpec) {
if (!podSpec) return; if (!podSpec) return;
podSpec.initContainers = (podSpec.initContainers ?? []).filter((entry) => entry?.name !== "hwlab-code-agent-workspace-init"); podSpec.initContainers = (podSpec.initContainers ?? []).filter((entry) => entry?.name !== "hwlab-code-agent-workspace-init");
const removedVolumeNames = new Set([ const removedVolumeNames = new Set([
@@ -927,6 +927,15 @@ function removeV02RepoOwnedCodeAgentPodConfig(podSpec) {
for (const container of podSpec.containers ?? []) { for (const container of podSpec.containers ?? []) {
container.volumeMounts = (container.volumeMounts ?? []).filter((mount) => !removedVolumeNames.has(mount?.name)); container.volumeMounts = (container.volumeMounts ?? []).filter((mount) => !removedVolumeNames.has(mount?.name));
} }
if (deploymentSpec?.strategy?.type === "Recreate") delete deploymentSpec.strategy;
}
function applyDeployServiceReplicas(item, deployService) {
if (!(item?.kind === "Deployment" || item?.kind === "StatefulSet")) return;
const replicas = deployService?.replicas;
if (!Number.isInteger(replicas) || replicas < 0) return;
item.spec ??= {};
item.spec.replicas = replicas;
} }
function deployServicesForProfile(deploy, profile) { function deployServicesForProfile(deploy, profile) {
@@ -1280,6 +1289,7 @@ function transformWorkloads({ workloads, deploy, catalog, source, sourceBranch =
const serviceId = serviceIdForWorkload(item, container); const serviceId = serviceIdForWorkload(item, container);
const deployService = deployServices.get(serviceId); const deployService = deployServices.get(serviceId);
if (!deployService) continue; if (!deployService) continue;
applyDeployServiceReplicas(item, deployService);
const artifact = runtimeArtifactForService({ catalog, deploy, serviceId, source, registryPrefix, useDeployImages, digestPin, envReuseServiceIds }); const artifact = runtimeArtifactForService({ catalog, deploy, serviceId, source, registryPrefix, useDeployImages, digestPin, envReuseServiceIds });
const envReuse = runtimeLane && v02EnvReuseEnabled(catalog, serviceId, envReuseServiceIds); const envReuse = runtimeLane && v02EnvReuseEnabled(catalog, serviceId, envReuseServiceIds);
const bootDeployService = envReuse ? deployServiceForBoot(deploy, serviceId, profile) : null; const bootDeployService = envReuse ? deployServiceForBoot(deploy, serviceId, profile) : null;
@@ -1327,7 +1337,7 @@ function transformWorkloads({ workloads, deploy, catalog, source, sourceBranch =
} }
if (serviceId === "hwlab-cloud-api") { if (serviceId === "hwlab-cloud-api") {
if (runtimeLane) { if (runtimeLane) {
removeV02RepoOwnedCodeAgentPodConfig(podTemplate.spec); removeV02RepoOwnedCodeAgentPodConfig(item.spec, podTemplate.spec);
upsertEnv(container.env, "HWLAB_M3_IO_CONTROL_ENABLED", "false"); upsertEnv(container.env, "HWLAB_M3_IO_CONTROL_ENABLED", "false");
upsertEnv(container.env, "HWLAB_CODE_AGENT_AGENTRUN_REPO_URL", gitReadUrl ?? defaultRuntimeLaneGitReadUrl); upsertEnv(container.env, "HWLAB_CODE_AGENT_AGENTRUN_REPO_URL", gitReadUrl ?? defaultRuntimeLaneGitReadUrl);
upsertEnv(container.env, "HWLAB_CODE_AGENT_AGENTRUN_PROVIDER_ID", runtimeNodeIdForProfile(deploy, profile)); upsertEnv(container.env, "HWLAB_CODE_AGENT_AGENTRUN_PROVIDER_ID", runtimeNodeIdForProfile(deploy, profile));