Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(workflow-recipes): drop the pre-deploy retryable branches that never took effect (#760)
Alfredo Lopez6069763d7842
diff --git a/workflow-recipes/package-lock.json b/workflow-recipes/package-lock.jsonindex 3b729548f..90d23e86c 100644--- a/workflow-recipes/package-lock.json+++ b/workflow-recipes/package-lock.json@@ -1,12 +1,12 @@{"name": "workload-recipes-controller",- "version": "0.1.468",+ "version": "0.1.469","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "workload-recipes-controller",- "version": "0.1.468",+ "version": "0.1.469","license": "SEE LICENSE IN LICENSE","dependencies": {"@aws-sdk/client-s3": "^3.1009.0",diff --git a/workflow-recipes/package.json b/workflow-recipes/package.jsonindex a0a649ea2..751245477 100644--- a/workflow-recipes/package.json+++ b/workflow-recipes/package.json@@ -1,6 +1,6 @@{"name": "workload-recipes-controller",- "version": "0.1.468",+ "version": "0.1.469","description": "Workload Recipes Controller (WRC) - WorkloadRecipe lifecycle management and MCP server interface","main": "dist/main.js","engines": {diff --git a/workflow-recipes/src/reconciler/mcpDelegation.test.ts b/workflow-recipes/src/reconciler/mcpDelegation.test.tsindex 21a1d6453..c31493f03 100644--- a/workflow-recipes/src/reconciler/mcpDelegation.test.ts+++ b/workflow-recipes/src/reconciler/mcpDelegation.test.ts@@ -6,7 +6,7 @@import { describe, expect, it, vi } from 'vitest'import { WorkflowRecipeCRD } from '../types'import { captureLogger, captureLoggerLevels } from './__tests__/captureLogger'-import { ResourceVanishedAfterConflictError, RetryableReconcileError } from './k8sErrors'+import { ResourceVanishedAfterConflictError } from './k8sErrors'import {DelegationDeps,PRE_DEPLOY_ANNOTATION,@@ -3029,10 +3029,9 @@ describe('preDeployMcpServers', () => {})const recipe = makeRecipe()- const outcome = preDeployMcpServers(deps, recipe, 'mcp-server', new Map())- await expect(outcome).rejects.toThrow('Pre-deploy failed for workload(s): redis-mcp')- // A permanent failure stays terminal (#998 audit).- await expect(outcome).rejects.not.toBeInstanceOf(RetryableReconcileError)+ await expect(preDeployMcpServers(deps, recipe, 'mcp-server', new Map())).rejects.toThrow(+ 'Pre-deploy failed for workload(s): redis-mcp'+ )})it('throws when the pre-deploy Context allowlist cannot be persisted', async () => {@@ -3054,123 +3053,9 @@ describe('preDeployMcpServers', () => {})const recipe = makeRecipe()- const outcome = preDeployMcpServers(deps, recipe, 'mcp-server', new Map())- await expect(outcome).rejects.toThrow('Pre-deploy Context allowlist failed')- // A permanent Context error stays terminal (#998 audit).- await expect(outcome).rejects.not.toBeInstanceOf(RetryableReconcileError)- })-- it('keeps a Context that vanished after a create conflict retryable on the pre-deploy path', async () => {- // GET 404, POST 409, re-read 404: the writer raises ResourceVanishedAfterConflictError.- // The pre-deploy wrapper must not turn it into a terminal error (#998 audit).- const deps = makePreDeployDeps({- customApi: {- createNamespacedCustomObject: vi- .fn()- .mockImplementation((opts: { body: { kind?: string } }) =>- opts.body.kind === 'Context' ? Promise.reject({ code: 409 }) : Promise.resolve({})- ),- getNamespacedCustomObject: vi.fn().mockRejectedValue({ code: 404 }),- patchNamespacedCustomObject: vi.fn().mockResolvedValue({}),- deleteNamespacedCustomObject: vi.fn().mockResolvedValue({}),- listNamespacedCustomObject: vi.fn().mockResolvedValue({ items: [] }),- } as any,- })- const recipe = makeRecipe()-- const error = await preDeployMcpServers(deps, recipe, 'mcp-server', new Map()).then(- () => undefined,- (e: unknown) => e- )-- expect(error).toBeInstanceOf(RetryableReconcileError)- expect((error as Error).message).toContain('Pre-deploy Context allowlist failed')- expect((error as Error).message).toContain('disappeared after create conflict')- expect((error as { cause?: unknown }).cause).toBeInstanceOf(ResourceVanishedAfterConflictError)- })-- it('keeps a pre-deploy failure retryable when every workload failed retryably', async () => {- // Service GET 404, POST 409, re-read 404 for the only transport workload.- const deps = makePreDeployDeps({- coreApi: {- createNamespacedService: vi.fn().mockRejectedValue({ code: 409 }),- readNamespacedService: vi.fn().mockRejectedValue({ code: 404 }),- replaceNamespacedService: vi.fn().mockResolvedValue({}),- deleteNamespacedService: vi.fn().mockResolvedValue({}),- } as any,- })- const recipe = makeRecipe()-- const error = await preDeployMcpServers(deps, recipe, 'mcp-server', new Map()).then(- () => undefined,- (e: unknown) => e- )-- expect(error).toBeInstanceOf(RetryableReconcileError)- expect((error as Error).message).toContain('Pre-deploy failed for workload(s): redis-mcp')- })-- it('keeps a pre-deploy failure terminal when any workload failed permanently', async () => {- // redis-mcp: its Service vanishes after a create conflict (retryable).- // files-mcp: its McpServer create fails with a permanent error.- const deps = makePreDeployDeps({- customApi: {- createNamespacedCustomObject: vi- .fn()- .mockImplementation((opts: { body: { kind?: string; metadata?: { name?: string } } }) =>- opts.body.kind === 'McpServer' && String(opts.body.metadata?.name).includes('files-mcp')- ? Promise.reject(new Error('quota exceeded'))- : Promise.resolve({})- ),- getNamespacedCustomObject: vi.fn().mockRejectedValue({ code: 404 }),- patchNamespacedCustomObject: vi.fn().mockResolvedValue({}),- deleteNamespacedCustomObject: vi.fn().mockResolvedValue({}),- listNamespacedCustomObject: vi.fn().mockResolvedValue({ items: [] }),- } as any,- coreApi: {- createNamespacedService: vi- .fn()- .mockImplementation((opts: { body: { metadata?: { name?: string } } }) =>- String(opts.body.metadata?.name).includes('redis-mcp')- ? Promise.reject({ code: 409 })- : Promise.resolve({})- ),- readNamespacedService: vi.fn().mockRejectedValue({ code: 404 }),- replaceNamespacedService: vi.fn().mockResolvedValue({}),- deleteNamespacedService: vi.fn().mockResolvedValue({}),- } as any,- })- const recipe = makeRecipe({- spec: {- workloads: [- {- id: 'redis-mcp',- type: 'deployment',- image: 'clerum/redis-mcp:latest',- port: 3000,- transport: { type: 'streamableHttp', path: '/mcp' },- },- {- id: 'files-mcp',- type: 'deployment',- image: 'clerum/files-mcp:latest',- port: 3000,- transport: { type: 'streamableHttp', path: '/mcp' },- },- ],- },- })-- const error = await preDeployMcpServers(deps, recipe, 'mcp-server', new Map()).then(- () => undefined,- (e: unknown) => e- )-- // Witness: both workloads failed and were reported.- expect((error as Error).message).toContain(- 'Pre-deploy failed for workload(s): redis-mcp, files-mcp'+ await expect(preDeployMcpServers(deps, recipe, 'mcp-server', new Map())).rejects.toThrow(+ 'Pre-deploy Context allowlist failed')- expect(error).not.toBeInstanceOf(RetryableReconcileError)})it('returns empty array when recipe has no transport workloads', async () => {diff --git a/workflow-recipes/src/reconciler/mcpDelegation.ts b/workflow-recipes/src/reconciler/mcpDelegation.tsindex f9cd6e780..09fa3981b 100644--- a/workflow-recipes/src/reconciler/mcpDelegation.ts+++ b/workflow-recipes/src/reconciler/mcpDelegation.ts@@ -24,11 +24,7 @@ import { createLogger } from '../observability/logger'import type { Logger } from '../observability/logger'import { WorkflowRecipeCRD, WorkloadDef } from '../types'import { CRD_GROUP, CRD_VERSION } from './crdConstants'-import {- ResourceVanishedAfterConflictError,- RetryableReconcileError,- getErrorCode,-} from './k8sErrors'+import { ResourceVanishedAfterConflictError, getErrorCode } from './k8sErrors'import {ownerRef,resolveWorkloadResourceName,@@ -1234,13 +1230,9 @@ export async function preDeployMcpServers(}if (errors.length > 0) {const ids = errors.map(e => e.workloadId).join(', ')- const message = `Pre-deploy failed for workload(s): ${ids}. Reconciler will retry to ensure all NetworkPolicies are applied before workloads start.`- // Retryable only when every failure was (e.g. a Service that vanished after- // a create conflict); one permanent failure keeps the error terminal.- if (errors.every(e => e.error instanceof RetryableReconcileError)) {- throw new RetryableReconcileError(message, { cause: errors[0].error })- }- throw new Error(message)+ throw new Error(+ `Pre-deploy failed for workload(s): ${ids}. Reconciler will retry to ensure all NetworkPolicies are applied before workloads start.`+ )}// Create (or update) the per-recipe Context CRD immediately after McpServers@@ -1268,15 +1260,11 @@ export async function preDeployMcpServers(recipe.metadata.namespace)} catch (err) {- const message = `Pre-deploy Context allowlist failed for "${recipe.metadata.name}": ${- err instanceof Error ? err.message : String(err)- }`- // Keep a retryable cause retryable, so the reconcile degrades and- // requeues instead of latching `failed` (#998 audit).- if (err instanceof RetryableReconcileError) {- throw new RetryableReconcileError(message, { cause: err })- }- throw new Error(message)+ throw new Error(+ `Pre-deploy Context allowlist failed for "${recipe.metadata.name}": ${+ err instanceof Error ? err.message : String(err)+ }`+ )}}