Skip to content

Commit c6a1fec

Browse files
committed
Trying out options for COORDINATOR_PORT and COORDINATOR_HOST env vars
1 parent 55b7ffe commit c6a1fec

File tree

2 files changed

+17372
-14210
lines changed

2 files changed

+17372
-14210
lines changed

apps/kubernetes-provider/src/index.ts

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
import * as k8s from "@kubernetes/client-node";
2+
import {
3+
EnvironmentType,
4+
MachinePreset,
5+
PostStartCauses,
6+
PreStopCauses,
7+
} from "@trigger.dev/core/v3";
28
import {
39
ProviderShell,
10+
SimpleLogger,
411
TaskOperations,
512
TaskOperationsCreateOptions,
613
TaskOperationsIndexOptions,
714
TaskOperationsPrePullDeploymentOptions,
815
TaskOperationsRestoreOptions,
916
} from "@trigger.dev/core/v3/apps";
10-
import { SimpleLogger } from "@trigger.dev/core/v3/apps";
11-
import {
12-
MachinePreset,
13-
PostStartCauses,
14-
PreStopCauses,
15-
EnvironmentType,
16-
} from "@trigger.dev/core/v3";
17-
import { TaskMonitor } from "./taskMonitor";
1817
import { PodCleaner } from "./podCleaner";
18+
import { TaskMonitor } from "./taskMonitor";
1919
import { UptimeHeartbeat } from "./uptimeHeartbeat";
2020

2121
const RUNTIME_ENV = process.env.KUBERNETES_PORT ? "kubernetes" : "local";
2222
const NODE_NAME = process.env.NODE_NAME || "local";
2323
const OTEL_EXPORTER_OTLP_ENDPOINT =
2424
process.env.OTEL_EXPORTER_OTLP_ENDPOINT ?? "http://0.0.0.0:4318";
25+
const COORDINATOR_HOST = process.env.COORDINATOR_HOST ?? undefined;
26+
const COORDINATOR_PORT = process.env.COORDINATOR_PORT ?? undefined;
2527

2628
const POD_CLEANER_INTERVAL_SECONDS = Number(process.env.POD_CLEANER_INTERVAL_SECONDS || "300");
2729

@@ -230,14 +232,31 @@ class KubernetesTaskOperations implements TaskOperations {
230232
command: ["/bin/sh", "-c"],
231233
args: ["printenv COORDINATOR_HOST | tee /etc/taskinfo/coordinator-host"],
232234
env: [
233-
{
234-
name: "COORDINATOR_HOST",
235-
valueFrom: {
236-
fieldRef: {
237-
fieldPath: "status.hostIP",
238-
},
239-
},
240-
},
235+
...(COORDINATOR_HOST
236+
? [
237+
{
238+
name: "COORDINATOR_HOST",
239+
value: COORDINATOR_HOST,
240+
},
241+
]
242+
: [
243+
{
244+
name: "COORDINATOR_HOST",
245+
valueFrom: {
246+
fieldRef: {
247+
fieldPath: "status.hostIP",
248+
},
249+
},
250+
},
251+
]),
252+
...(COORDINATOR_PORT
253+
? [
254+
{
255+
name: "COORDINATOR_PORT",
256+
value: COORDINATOR_PORT,
257+
},
258+
]
259+
: []),
241260
],
242261
volumeMounts: [
243262
{
@@ -435,14 +454,7 @@ class KubernetesTaskOperations implements TaskOperations {
435454
},
436455
},
437456
},
438-
{
439-
name: "COORDINATOR_HOST",
440-
valueFrom: {
441-
fieldRef: {
442-
fieldPath: "status.hostIP",
443-
},
444-
},
445-
},
457+
446458
{
447459
name: "MACHINE_NAME",
448460
valueFrom: {
@@ -451,6 +463,19 @@ class KubernetesTaskOperations implements TaskOperations {
451463
},
452464
},
453465
},
466+
...(COORDINATOR_HOST
467+
? [{ name: "COORDINATOR_HOST", value: COORDINATOR_HOST }]
468+
: [
469+
{
470+
name: "COORDINATOR_HOST",
471+
valueFrom: {
472+
fieldRef: {
473+
fieldPath: "status.hostIP",
474+
},
475+
},
476+
},
477+
]),
478+
...(COORDINATOR_PORT ? [{ name: "COORDINATOR_PORT", value: COORDINATOR_PORT }] : []),
454479
];
455480
}
456481

0 commit comments

Comments
 (0)