Skip to content

Commit 81a8811

Browse files
committed
Pass in deployment id and version when scheduling runs (supervisor)
1 parent 5f8edb7 commit 81a8811

File tree

6 files changed

+20
-4
lines changed

6 files changed

+20
-4
lines changed

apps/supervisor/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ class ManagedSupervisor {
252252
machine: message.run.machine,
253253
orgId: message.organization.id,
254254
projectId: message.project.id,
255+
deploymentId: message.deployment.friendlyId,
256+
deploymentVersion: message.deployment.version,
255257
runId: message.run.id,
256258
runFriendlyId: message.run.friendlyId,
257259
version: message.version,

apps/supervisor/src/workloadManager/docker.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ export class DockerWorkloadManager implements WorkloadManager {
7272
`TRIGGER_DEQUEUED_AT_MS=${opts.dequeuedAt.getTime()}`,
7373
`TRIGGER_POD_SCHEDULED_AT_MS=${Date.now()}`,
7474
`TRIGGER_ENV_ID=${opts.envId}`,
75+
`TRIGGER_DEPLOYMENT_ID=${opts.deploymentId}`,
76+
`TRIGGER_DEPLOYMENT_VERSION=${opts.deploymentVersion}`,
7577
`TRIGGER_RUN_ID=${opts.runFriendlyId}`,
7678
`TRIGGER_SNAPSHOT_ID=${opts.snapshotFriendlyId}`,
7779
`TRIGGER_SUPERVISOR_API_PROTOCOL=${this.opts.workloadApiProtocol}`,

apps/supervisor/src/workloadManager/kubernetes.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,14 @@ export class KubernetesWorkloadManager implements WorkloadManager {
123123
name: "TRIGGER_ENV_ID",
124124
value: opts.envId,
125125
},
126+
{
127+
name: "TRIGGER_DEPLOYMENT_ID",
128+
value: opts.deploymentId,
129+
},
130+
{
131+
name: "TRIGGER_DEPLOYMENT_VERSION",
132+
value: opts.deploymentVersion,
133+
},
126134
{
127135
name: "TRIGGER_SNAPSHOT_ID",
128136
value: opts.snapshotFriendlyId,

apps/supervisor/src/workloadManager/types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ export interface WorkloadManagerCreateOptions {
2929
envType: EnvironmentType;
3030
orgId: string;
3131
projectId: string;
32+
deploymentId: string;
33+
deploymentVersion: string;
3234
runId: string;
3335
runFriendlyId: string;
3436
snapshotId: string;

internal-packages/run-engine/src/engine/systems/dequeueSystem.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,9 @@ export class DequeueSystem {
560560
version: result.worker.version,
561561
},
562562
deployment: {
563-
id: result.deployment?.id,
564-
friendlyId: result.deployment?.friendlyId,
563+
id: result.deployment?.id ?? "",
564+
friendlyId: result.deployment?.friendlyId ?? "",
565+
version: result.deployment?.version ?? "",
565566
imagePlatform: result.deployment?.imagePlatform,
566567
},
567568
run: {

packages/core/src/v3/schemas/runEngine.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,9 @@ export const DequeuedMessage = z.object({
246246
version: z.string(),
247247
}),
248248
deployment: z.object({
249-
id: z.string().optional(),
250-
friendlyId: z.string().optional(),
249+
id: z.string(),
250+
friendlyId: z.string(),
251+
version: z.string(),
251252
imagePlatform: z.string().optional(),
252253
}),
253254
run: z.object({

0 commit comments

Comments
 (0)