fix: remove legacy cluster container dependencies (#40)
Co-authored-by: mmckeen-nv <mmckeen-nv@users.noreply.github.com>
This commit is contained in:
@@ -20,9 +20,6 @@ import {
|
||||
} from "@/app/lib/hostCommands"
|
||||
|
||||
const execFileAsync = promisify(execFile)
|
||||
const DOCKER_BIN = process.env.DOCKER_BIN || "docker"
|
||||
const OPENSHELL_CLUSTER_CONTAINER = process.env.OPENSHELL_CLUSTER_CONTAINER || "openshell-cluster-nemoclaw"
|
||||
const OPENSHELL_NAMESPACE = process.env.OPENSHELL_SANDBOX_NAMESPACE || "openshell"
|
||||
const NEMOCLAW_REGISTRY_FILE = path.join(process.env.HOME || "/tmp", ".nemoclaw", "sandboxes.json")
|
||||
|
||||
function validateSandboxName(name: string) {
|
||||
@@ -88,7 +85,7 @@ type CreateInferenceSettings = {
|
||||
}
|
||||
|
||||
type NemoClawRegistryData = {
|
||||
sandboxes?: Record<string, { name?: string; createdAt?: string }>
|
||||
sandboxes?: Record<string, { name?: string; createdAt?: string; imageTag?: string }>
|
||||
defaultSandbox?: string | null
|
||||
}
|
||||
|
||||
@@ -254,27 +251,6 @@ function resolveNemoClawBasePolicyPath() {
|
||||
return found
|
||||
}
|
||||
|
||||
async function readPodImage(sandboxName: string, jsonpath: string) {
|
||||
const { stdout } = await execFileAsync(DOCKER_BIN, [
|
||||
"exec",
|
||||
OPENSHELL_CLUSTER_CONTAINER,
|
||||
"kubectl",
|
||||
"get",
|
||||
"pod",
|
||||
sandboxName,
|
||||
"-n",
|
||||
OPENSHELL_NAMESPACE,
|
||||
"-o",
|
||||
`jsonpath=${jsonpath}`,
|
||||
], {
|
||||
env: hostCommandEnv(),
|
||||
timeout: 10000,
|
||||
maxBuffer: 1024 * 1024,
|
||||
})
|
||||
|
||||
return String(stdout).trim().split(/\s+/)[0] || null
|
||||
}
|
||||
|
||||
function stripAnsi(value: string) {
|
||||
return value.replace(/\u001b\[[0-9;]*m/g, "")
|
||||
}
|
||||
@@ -323,12 +299,11 @@ async function resolveSourcePodImageFromRef(sourceSandboxRef: string) {
|
||||
const requested = sourceSandboxRef.trim()
|
||||
const source = await resolveSandboxRef(requested)
|
||||
const sourceName = validateSandboxName(source.name)
|
||||
const sourceImage = await readPodImage(sourceName, '{.spec.containers[?(@.name=="agent")].image}')
|
||||
.catch(() => null)
|
||||
|| await readPodImage(sourceName, "{.spec.containers[0].image}").catch(() => null)
|
||||
const registryEntry = readNemoClawRegistry().sandboxes?.[sourceName]
|
||||
const sourceImage = registryEntry?.imageTag?.trim() || null
|
||||
|
||||
if (!sourceImage) {
|
||||
throw new Error(`Could not resolve the running image for source sandbox '${sourceName}'.`)
|
||||
throw new Error(`Could not resolve the registered image for source sandbox '${sourceName}'. Rebuild it with current NemoClaw to record imageTag.`)
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
+3
-19
@@ -1,6 +1,6 @@
|
||||
import { execFile } from "node:child_process"
|
||||
import { promisify } from "node:util"
|
||||
import { HOST_PATH, OPENSHELL_BIN, hostCommandEnv } from "./hostCommands"
|
||||
import { OPENSHELL_BIN, hostCommandEnv } from "./hostCommands"
|
||||
import { resolveSandboxRef } from "./openshellHost"
|
||||
|
||||
const execFileAsync = promisify(execFile)
|
||||
@@ -12,21 +12,6 @@ function shouldUseProxyWrappedBrokerUrl() {
|
||||
return /^(1|true|yes|on)$/i.test(process.env.OPENSHELL_CONTROL_MCP_BROKER_PROXY_URL || "")
|
||||
}
|
||||
|
||||
async function discoverOpenShellDockerGateway() {
|
||||
const container = process.env.OPEN_SHELL_CONTAINER || "openshell-cluster-nemoclaw"
|
||||
const { stdout } = await execFileAsync("docker", ["inspect", container], {
|
||||
env: { ...process.env, PATH: HOST_PATH },
|
||||
timeout: 5000,
|
||||
maxBuffer: 1024 * 1024,
|
||||
})
|
||||
const [inspect] = JSON.parse(String(stdout)) as Array<{
|
||||
NetworkSettings?: {
|
||||
Networks?: Record<string, { Gateway?: string }>
|
||||
}
|
||||
}>
|
||||
const networks = inspect?.NetworkSettings?.Networks || {}
|
||||
return Object.values(networks).map((network) => network.Gateway).find(Boolean) || null
|
||||
}
|
||||
|
||||
function normalizeProxyOrigin(value: string) {
|
||||
try {
|
||||
@@ -41,7 +26,7 @@ function normalizeProxyOrigin(value: string) {
|
||||
async function runOpenShell(args: string[]) {
|
||||
const { stdout } = await execFileAsync(OPENSHELL_BIN, args, {
|
||||
env: hostCommandEnv({
|
||||
OPENSHELL_GATEWAY: process.env.OPENSHELL_GATEWAY || "nemoclaw",
|
||||
OPENSHELL_GATEWAY: process.env.OPENSHELL_GATEWAY?.trim() || undefined,
|
||||
TERM: "dumb",
|
||||
}),
|
||||
timeout: 15000,
|
||||
@@ -66,8 +51,7 @@ export async function brokerBaseUrlForSandbox(
|
||||
const origin = new URL(request.url).origin
|
||||
const publicOrigin = new URL(origin)
|
||||
if (LOCAL_HOSTNAMES.has(publicOrigin.hostname)) {
|
||||
const gateway = await discoverOpenShellDockerGateway().catch(() => null)
|
||||
publicOrigin.hostname = gateway || "host.docker.internal"
|
||||
publicOrigin.hostname = "host.docker.internal"
|
||||
}
|
||||
|
||||
const hostBrokerUrl = `${publicOrigin.toString().replace(/\/+$/, "")}/api/mcp/broker`
|
||||
|
||||
Reference in New Issue
Block a user