Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix: make registry secret mutations identity-safe

Alfredo Lopez7251309d5960
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index c84f952c0..faefb55b7 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.501",
+ "version": "0.1.502",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.501",
+ "version": "0.1.502",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/image-policy": "file:../packages/image-policy",
diff --git a/control-api/package.json b/control-api/package.json
index 4cd446747..072449e94 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.501",
+ "version": "0.1.502",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/routes/admin/registry.ts b/control-api/src/routes/admin/registry.ts
index 573c05430..279f7285f 100644
--- a/control-api/src/routes/admin/registry.ts
+++ b/control-api/src/routes/admin/registry.ts
@@ -1417,7 +1417,7 @@ async function rollbackCreatedSecret(gateway: K8sGateway, snapshot: SecretSnapsh
// or the reference graph cannot be read completely, preserve it for repair;
// a name-only compensation decision is not safe across independent CRDs.
const referenceState = await findSecretReferenceState(gateway, snapshot.name, snapshot.namespace)
- if (referenceState !== 'not-referenced') return
+ if (referenceState !== 'not-referenced') throw new RegistryInstallRollbackError()
for (let attempt = 1; attempt <= 2; attempt += 1) {
try {
@@ -3632,6 +3632,38 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
}
} else {
// Uninstall MCP Server
+ let credentialSecretSnapshot: SecretSnapshot | null = null
+ const credentialSecretName = `${resourceName}-credentials`
+
+ // Capture the credential identity before deleting the parent CR. A
+ // same-name Secret replacement can be created after the CR delete;
+ // reading by name afterwards would make the cleanup delete a
+ // different owner's object. The later delete is bound to this exact
+ // UID/RV snapshot.
+ try {
+ credentialSecretSnapshot = normalizeSecretSnapshot(
+ await gateway.getSecret(credentialSecretName, namespace),
+ credentialSecretName,
+ namespace
+ )
+ } catch (err) {
+ if (extractK8sError(err)?.status !== 404) {
+ res.status(503).json({
+ error: 'registry_uninstall_outcome_ambiguous',
+ outcome: 'repair_required',
+ resourceName,
+ resourceType,
+ namespace,
+ deleted,
+ warnings: [
+ ...warnings,
+ `Secret/${credentialSecretName}: ${err instanceof Error ? err.message : 'unable to verify identity'}`,
+ ],
+ })
+ return
+ }
+ }
+
try {
const current = await readResourceForRollback(gateway, 'mcpservers', {
metadata: { name: resourceName, namespace },
@@ -3670,15 +3702,22 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
// Delete credential Secret
try {
- const secretName = `${resourceName}-credentials`
- const current = await gateway.getSecret(secretName, namespace)
- const snapshot = normalizeSecretSnapshot(current, secretName, namespace)
- await gateway.deleteSecret(secretName, namespace, secretPreconditions(snapshot))
- await waitForDeletion(
- () => gateway.getSecret(secretName, namespace),
- `Secret/${secretName}`
- )
- deleted.push(`Secret/${secretName}`)
+ if (credentialSecretSnapshot) {
+ await gateway.deleteSecret(
+ credentialSecretSnapshot.name,
+ credentialSecretSnapshot.namespace,
+ secretPreconditions(credentialSecretSnapshot)
+ )
+ await waitForDeletion(
+ () =>
+ gateway.getSecret(
+ credentialSecretSnapshot!.name,
+ credentialSecretSnapshot!.namespace
+ ),
+ `Secret/${credentialSecretSnapshot.name}`
+ )
+ deleted.push(`Secret/${credentialSecretSnapshot.name}`)
+ }
} catch (err) {
if (extractK8sError(err)?.status !== 404) {
res.status(503).json({
@@ -3690,7 +3729,7 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
deleted,
warnings: [
...warnings,
- `Secret/${resourceName}-credentials: ${err instanceof Error ? err.message : 'unable to verify deletion'}`,
+ `Secret/${credentialSecretName}: ${err instanceof Error ? err.message : 'unable to verify deletion'}`,
],
})
return
@@ -4194,7 +4233,7 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
// on the Secret, and the failed request may have been accepted by a
// different apiserver path. Preserve the credential state and make
// repair explicit until the caller can reconcile both resources.
- if (outcomeIsAmbiguous && hasCredentialUpdates) {
+ if (upgradeOutcome === 'ambiguous' && hasCredentialUpdates) {
res.status(503).json({
error: 'registry_upgrade_outcome_ambiguous',
outcome: 'repair_required',
@@ -4210,7 +4249,7 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
return
}
- if (!outcomeIsAmbiguous && hasCredentialUpdates) {
+ if (upgradeOutcome !== 'ambiguous' && hasCredentialUpdates) {
try {
if (!mutatedSecretPreconditions) {
throw Object.assign(new Error('mutated Secret identity unavailable'), {
diff --git a/control-api/src/routes/admin/secrets.ts b/control-api/src/routes/admin/secrets.ts
index fc798b12b..a2b046403 100644
--- a/control-api/src/routes/admin/secrets.ts
+++ b/control-api/src/routes/admin/secrets.ts
@@ -19,6 +19,7 @@ import {
} from '../../services/secretConstraints.js'
import { invalidSecretDataKeyReason } from '../../services/secretKeys.js'
import { findSecretReferenceState } from '../../services/secretReferenceService.js'
+import { secretIdentityPreconditions } from '../../services/secretRepository.js'
import { toPublicDeleteSecretSummary, toPublicSecretSummary } from '../../services/secretService.js'
import { SecretPreconditions, SecretUpsertRequest } from '../../types.js'
import { listHostSecrets } from './hostSecrets.js'
@@ -58,23 +59,14 @@ const PLATFORM_MANAGED_SECRET_ERROR =
`Secret "${EVENFIRE_REGISTRY_PULL_SECRET_NAME}" is platform-managed (the evenfire ` +
'registry image-pull credential) and cannot be created, modified, or deleted here'
-function secretIdentityPreconditions(raw: unknown): SecretPreconditions | null {
- const metadata = (raw as { metadata?: { uid?: unknown; resourceVersion?: unknown } } | null)
- ?.metadata
- if (typeof metadata?.uid !== 'string' || !metadata.uid) return null
- if (typeof metadata.resourceVersion !== 'string' || !metadata.resourceVersion) return null
- return { uid: metadata.uid, resourceVersion: metadata.resourceVersion }
-}
-
/**
* A data-only merge is allowed to compose with another owner updating a
* disjoint key. UID still fences delete/recreate, while resourceVersion is
* deliberately omitted so the merge-patch remains multi-owner safe.
*/
function secretUidPrecondition(raw: unknown): SecretPreconditions | null {
- const metadata = (raw as { metadata?: { uid?: unknown } } | null)?.metadata
- if (typeof metadata?.uid !== 'string' || !metadata.uid) return null
- return { uid: metadata.uid }
+ const identity = secretIdentityPreconditions(raw)
+ return identity ? { uid: identity.uid } : null
}
function requestSecretPreconditions(raw: unknown): SecretPreconditions | null {
@@ -835,14 +827,28 @@ export function createAdminSecretsRouter(gateway: K8sGateway): Router {
})
.map(item => {
const metadata = (
- item as { metadata?: { name?: string; labels?: Record<string, string> } }
+ item as {
+ metadata?: {
+ name?: string
+ labels?: Record<string, string>
+ uid?: string
+ resourceVersion?: string
+ }
+ }
).metadata
const name = String(metadata?.name || '').trim()
const keys = Array.isArray((item as { keys?: string[] }).keys)
? (item as { keys: string[] }).keys
: []
const ownership = parseSecretOwnership(metadata?.labels || {})
- return { name, namespace, keys, ownership }
+ const identity = secretIdentityPreconditions(item)
+ return {
+ name,
+ namespace,
+ keys,
+ ownership,
+ ...(identity ?? {}),
+ }
})
.filter(row => row.name.length > 0)
)
@@ -921,11 +927,17 @@ export function createAdminSecretsRouter(gateway: K8sGateway): Router {
stringData: data,
}
- await gateway.createSecret(secretReq)
+ const created = await gateway.createSecret(secretReq)
+ const identity = secretIdentityPreconditions(created)
+ if (!identity) {
+ res.status(503).json({ error: 'secret_identity_unavailable', outcome: 'repair_required' })
+ return
+ }
res.status(201).json({
name: name.trim(),
namespace: targetNamespace,
ownership,
+ ...identity,
created: true,
})
})
diff --git a/control-api/src/services/resourceService.ts b/control-api/src/services/resourceService.ts
index 825ceb56b..9aa4925ad 100644
--- a/control-api/src/services/resourceService.ts
+++ b/control-api/src/services/resourceService.ts
@@ -59,6 +59,8 @@ export type MutableResourceSnapshot = {
uid?: string
resourceVersion?: string
generation?: number
+ ownerReferences?: Array<Record<string, unknown>>
+ finalizers?: string[]
}
spec?: Record<string, unknown>
}
@@ -346,6 +348,8 @@ export class ResourceService {
uid?: string
resourceVersion?: string
generation?: number
+ ownerReferences?: Array<Record<string, unknown>>
+ finalizers?: string[]
}
}
@@ -382,6 +386,10 @@ export class ResourceService {
...(current.metadata?.labels && { labels: current.metadata.labels }),
...(sanitizedMetadata?.labels && { labels: sanitizedMetadata.labels }),
...(annotations && { annotations }),
+ ...(current.metadata?.ownerReferences && {
+ ownerReferences: current.metadata.ownerReferences,
+ }),
+ ...(current.metadata?.finalizers && { finalizers: current.metadata.finalizers }),
},
spec: body.spec,
}
@@ -602,6 +610,10 @@ export class ResourceService {
...(current.metadata?.labels && { labels: current.metadata.labels }),
...(sanitizedMetadata?.labels && { labels: sanitizedMetadata.labels }),
...(annotations && { annotations }),
+ ...(current.metadata?.ownerReferences && {
+ ownerReferences: current.metadata.ownerReferences,
+ }),
+ ...(current.metadata?.finalizers && { finalizers: current.metadata.finalizers }),
},
spec: next.spec,
}
diff --git a/control-api/src/services/secretRepository.ts b/control-api/src/services/secretRepository.ts
index 43cb08cdf..3a187be6c 100644
--- a/control-api/src/services/secretRepository.ts
+++ b/control-api/src/services/secretRepository.ts
@@ -94,3 +94,25 @@ export function toSecretSnapshot(
...(source.stringData ? { stringData: source.stringData } : {}),
}
}
+
+/**
+ * Read a Secret identity at a boundary that may receive either the raw
+ * Kubernetes resource or the flat server-owned SecretSnapshot. Mutation
+ * routes must not depend on one representation accidentally being returned by
+ * a mock or a different gateway method.
+ */
+export function secretIdentityPreconditions(raw: unknown): SecretPreconditions | null {
+ const value = (raw ?? {}) as {
+ uid?: unknown
+ resourceVersion?: unknown
+ metadata?: { uid?: unknown; resourceVersion?: unknown }
+ }
+ const uid = typeof value.uid === 'string' ? value.uid : value.metadata?.uid
+ const resourceVersion =
+ typeof value.resourceVersion === 'string'
+ ? value.resourceVersion
+ : value.metadata?.resourceVersion
+ if (typeof uid !== 'string' || !uid.trim()) return null
+ if (typeof resourceVersion !== 'string' || !resourceVersion.trim()) return null
+ return { uid, resourceVersion }
+}
diff --git a/control-api/src/services/secretService.ts b/control-api/src/services/secretService.ts
index c28d5f113..a9afbcfac 100644
--- a/control-api/src/services/secretService.ts
+++ b/control-api/src/services/secretService.ts
@@ -81,6 +81,8 @@ export class SecretService {
metadata: {
name: s.metadata?.name,
namespace: s.metadata?.namespace,
+ ...(s.metadata?.uid ? { uid: s.metadata.uid } : {}),
+ ...(s.metadata?.resourceVersion ? { resourceVersion: s.metadata.resourceVersion } : {}),
labels: s.metadata?.labels || {},
annotations: s.metadata?.annotations || {},
},
diff --git a/control-api/src/types.ts b/control-api/src/types.ts
index 5da8cb6b8..173e98f92 100644
--- a/control-api/src/types.ts
+++ b/control-api/src/types.ts
@@ -18,6 +18,8 @@ export interface Metadata {
labels?: Record<string, string>
annotations?: Record<string, string>
resourceVersion?: string
+ ownerReferences?: Array<Record<string, unknown>>
+ finalizers?: string[]
}
export interface ClerumResource<TSpec = Record<string, unknown>> {
diff --git a/control-api/test/mockGateway.ts b/control-api/test/mockGateway.ts
index b448a6ed7..64c5e3ab7 100644
--- a/control-api/test/mockGateway.ts
+++ b/control-api/test/mockGateway.ts
@@ -41,6 +41,8 @@ type ResourceBody = {
creationTimestamp?: string
resourceVersion?: string
uid?: string
+ ownerReferences?: Array<Record<string, unknown>>
+ finalizers?: string[]
}
spec: Record<string, unknown>
status?: Record<string, unknown>
@@ -55,6 +57,8 @@ type ResourceRecord = {
creationTimestamp?: string
resourceVersion?: string
uid?: string
+ ownerReferences?: Array<Record<string, unknown>>
+ finalizers?: string[]
}
spec: Record<string, unknown>
status?: Record<string, unknown>
@@ -268,6 +272,8 @@ export class MockGateway {
...(body.metadata.creationTimestamp && {
creationTimestamp: body.metadata.creationTimestamp,
}),
+ ...(body.metadata.ownerReferences && { ownerReferences: body.metadata.ownerReferences }),
+ ...(body.metadata.finalizers && { finalizers: body.metadata.finalizers }),
resourceVersion: body.metadata.resourceVersion ?? '1',
},
spec: body.spec || {},
@@ -294,6 +300,8 @@ export class MockGateway {
annotations?: Record<string, string>
uid?: string
resourceVersion?: string
+ ownerReferences?: Array<Record<string, unknown>>
+ finalizers?: string[]
}
spec: Record<string, unknown>
},
diff --git a/control-api/test/routes.mcpSecrets.test.ts b/control-api/test/routes.mcpSecrets.test.ts
index ed0b13233..09e6bb2bf 100644
--- a/control-api/test/routes.mcpSecrets.test.ts
+++ b/control-api/test/routes.mcpSecrets.test.ts
@@ -31,12 +31,8 @@ function createGateway() {
listSecrets: vi.fn(async () => []),
createSecret: vi.fn(async (body: SecretWrite) => ({
...writeSummary(body),
- metadata: {
- name: body.name,
- namespace: body.namespace || 'mcp-server',
- uid: `uid-${body.name}`,
- resourceVersion: '1',
- },
+ uid: `uid-${body.name}`,
+ resourceVersion: '1',
})),
updateSecret: vi.fn(async (body: SecretWrite) => writeSummary(body)),
deleteSecret: vi.fn(async (name: string, namespace?: string) => ({
@@ -74,12 +70,8 @@ function createGateway() {
mergeSecret: vi.fn(async (body: SecretWrite) => ({
name: body.name,
namespace: body.namespace || 'mcp-server',
- metadata: {
- name: body.name,
- namespace: body.namespace || 'mcp-server',
- uid: `uid-${body.name}`,
- resourceVersion: '2',
- },
+ uid: `uid-${body.name}`,
+ resourceVersion: '2',
keys: ['EXISTING_KEY', ...Object.keys(body.stringData ?? {})].sort((a, b) =>
a.localeCompare(b)
),
diff --git a/control-api/test/routes.recipeSecrets.ownership.test.ts b/control-api/test/routes.recipeSecrets.ownership.test.ts
index 508c58ef0..a1fa3000a 100644
--- a/control-api/test/routes.recipeSecrets.ownership.test.ts
+++ b/control-api/test/routes.recipeSecrets.ownership.test.ts
@@ -55,8 +55,16 @@ function createGateway(opts: { recipes?: string[]; secrets?: MockSecret[] } = {}
listSecrets: vi.fn(async () => [...secrets.values()]),
getSecret: vi.fn(async (name: string) => secrets.get(name) ?? null),
createSecret: vi.fn(async (body: MockWrite) => {
- secrets.set(body.name, { metadata: { name: body.name, labels: body.labels ?? {} } })
- return writeSummary(body)
+ const created = {
+ metadata: {
+ name: body.name,
+ labels: body.labels ?? {},
+ uid: `uid-${body.name}`,
+ resourceVersion: '1',
+ },
+ }
+ secrets.set(body.name, created)
+ return { ...writeSummary(body), uid: created.metadata.uid, resourceVersion: '1' }
}),
updateSecret: vi.fn(async (body: MockWrite) => {
const existing = secrets.get(body.name)
diff --git a/control-api/test/routes.registryInstall.test.ts b/control-api/test/routes.registryInstall.test.ts
index f1abc72be..7ea2b7e4e 100644
--- a/control-api/test/routes.registryInstall.test.ts
+++ b/control-api/test/routes.registryInstall.test.ts
@@ -1190,9 +1190,12 @@ describe('POST /admin/registry/install', () => {
registryEntryVersion: '1.0.0',
credentials: { AIRTABLE_API_KEY: 'api-key-test-token' },
})
- .expect(422)
+ .expect(500)
- expect(res.body.error).toContain('resource rejected by validation')
+ expect(res.body).toMatchObject({
+ error: 'registry_install_rollback_incomplete',
+ outcome: 'compensation_failed',
+ })
expect(deleteSecretSpy).not.toHaveBeenCalled()
await expect(gw.getSecret('my-airtable-credentials', 'mcp-server')).resolves.toMatchObject({
metadata: { uid: expect.any(String), resourceVersion: expect.any(String) },
@@ -3364,6 +3367,48 @@ describe('DELETE /admin/registry/uninstall/:serverName', () => {
expect(res.body.resourceName).toBe('nonexistent')
})
+ it('does not delete a replacement Secret that wins after the resource delete', async () => {
+ const gw = new MockGateway('mcp-server')
+ await gw.createResource(
+ 'mcpservers',
+ { metadata: { name: 'secret-race' }, spec: { image: 'test:original' } },
+ 'mcp-server'
+ )
+ const secretName = 'secret-race-credentials'
+ gw.seedSecret(secretName, 'mcp-server', {
+ uid: 'uid-secret-original',
+ resourceVersion: '1',
+ })
+ ;(gw as unknown as { _seeded?: boolean })._seeded = true
+
+ const originalDeleteResource = gw.deleteResource.bind(gw)
+ let raced = false
+ vi.spyOn(gw, 'deleteResource').mockImplementation(async (...args) => {
+ if (args[0] === 'mcpservers' && !raced) {
+ raced = true
+ const result = await originalDeleteResource(...args)
+ await gw.deleteSecret(secretName, 'mcp-server')
+ gw.seedSecret(secretName, 'mcp-server', {
+ uid: 'uid-secret-replacement',
+ resourceVersion: '1',
+ })
+ return result
+ }
+ return originalDeleteResource(...args)
+ })
+
+ const { app } = makeApp(gw)
+ const res = await request(app).delete('/admin/registry/uninstall/secret-race').expect(503)
+
+ expect(res.body).toMatchObject({
+ error: 'registry_uninstall_outcome_ambiguous',
+ outcome: 'repair_required',
+ })
+ await expect(gw.getSecret(secretName, 'mcp-server')).resolves.toMatchObject({
+ metadata: { uid: 'uid-secret-replacement', resourceVersion: '1' },
+ })
+ })
+
it('does not delete a same-name replacement that wins the uninstall race', async () => {
const gw = new MockGateway('mcp-server')
await gw.createResource('mcpservers', {
@@ -3610,13 +3655,11 @@ describe('POST /admin/registry/upgrade', () => {
.expect(503)
expect(res.body).toMatchObject({
- error: 'registry_upgrade_outcome_ambiguous',
- outcome: 'repair_required',
+ error: 'registry_upgrade_outcome_not_committed',
+ outcome: 'not_committed',
})
expect(updateSpy).toHaveBeenCalled()
- await expect(gw.getSecret(secretName, 'mcp-server')).resolves.toMatchObject({
- metadata: { uid: expect.any(String), resourceVersion: expect.any(String) },
- })
+ await expect(gw.getSecret(secretName, 'mcp-server')).rejects.toMatchObject({ statusCode: 404 })
})
it('persists envSecret and returns pendingCredentials during MCP upgrade when credentials remain unmaterialized', async () => {
@@ -4051,7 +4094,7 @@ describe('POST /admin/registry/upgrade', () => {
getResourceSpy.mockRestore()
})
- it('preserves credentials after a CAS fence proves the CR update did not commit', async () => {
+ it('compensates credentials after a CAS fence proves the CR update did not commit', async () => {
vi.mocked(getEntryVersion).mockResolvedValueOnce(MOCK_ENTRY_V2 as any)
vi.mocked(getCredentialSchema).mockResolvedValueOnce({
required: true,
@@ -4083,13 +4126,17 @@ describe('POST /admin/registry/upgrade', () => {
.expect(503)
expect(res.body).toMatchObject({
- error: 'registry_upgrade_outcome_ambiguous',
- outcome: 'repair_required',
+ error: 'registry_upgrade_outcome_not_committed',
+ outcome: 'not_committed',
})
expect(updateSpy).toHaveBeenCalledTimes(2)
- expect(deleteSecretSpy).not.toHaveBeenCalled()
- await expect(gw.getSecret('my-srv-credentials', 'mcp-server')).resolves.toMatchObject({
- metadata: { uid: expect.any(String), resourceVersion: expect.any(String) },
+ expect(deleteSecretSpy).toHaveBeenCalledWith(
+ 'my-srv-credentials',
+ 'mcp-server',
+ expect.objectContaining({ uid: expect.any(String), resourceVersion: expect.any(String) })
+ )
+ await expect(gw.getSecret('my-srv-credentials', 'mcp-server')).rejects.toMatchObject({
+ statusCode: 404,
})
})
@@ -4515,11 +4562,11 @@ describe('POST /admin/registry/upgrade', () => {
registryEntryVersion: '2.0.0',
[authField]: { [apiKey]: 'fresh-value' },
})
- .expect(503)
+ .expect(500)
expect(res.body).toMatchObject({
- error: 'registry_upgrade_outcome_ambiguous',
- outcome: 'repair_required',
+ error: 'registry_upgrade_rollback_incomplete',
+ outcome: 'compensation_failed',
})
expect(updateSpy).toHaveBeenCalledTimes(2)
expect(deleteSpy).not.toHaveBeenCalled()
diff --git a/control-api/test/routes.secrets.test.ts b/control-api/test/routes.secrets.test.ts
index 02a1c75f1..bc323c8f7 100644
--- a/control-api/test/routes.secrets.test.ts
+++ b/control-api/test/routes.secrets.test.ts
@@ -154,7 +154,10 @@ describe('routes/secrets', () => {
data: entry.data,
}
}),
- createSecret: vi.fn(async (body: unknown) => writeSummary(body)),
+ createSecret: vi.fn(async (body: unknown) => {
+ const summary = writeSummary(body)
+ return { ...summary, uid: `uid-${summary.name}`, resourceVersion: '1' }
+ }),
updateSecret: vi.fn(async (body: unknown) => writeSummary(body)),
deleteSecret: vi.fn(async (name: string, namespace?: string) => ({
deleted: true,
diff --git a/control-api/test/services.resourceService.test.ts b/control-api/test/services.resourceService.test.ts
index 7d66a9f57..5da2da662 100644
--- a/control-api/test/services.resourceService.test.ts
+++ b/control-api/test/services.resourceService.test.ts
@@ -98,6 +98,15 @@ describe('ResourceService.updateResource', () => {
namespace: 'channels',
uid: 'uid-original',
resourceVersion: '10',
+ ownerReferences: [
+ {
+ apiVersion: 'clerum.io/v1alpha1',
+ kind: 'WorkflowRecipe',
+ name: 'parent',
+ uid: 'uid-parent',
+ },
+ ],
+ finalizers: ['clerum.io/workload-cleanup'],
},
spec: { enabled: true },
}),
@@ -128,6 +137,15 @@ describe('ResourceService.updateResource', () => {
const replaceArgs = customApi.replaceNamespacedCustomObject.mock.calls[0][0]
expect(replaceArgs.body.metadata.uid).toBe('uid-original')
expect(replaceArgs.body.metadata.resourceVersion).toBe('10')
+ expect(replaceArgs.body.metadata.ownerReferences).toEqual([
+ {
+ apiVersion: 'clerum.io/v1alpha1',
+ kind: 'WorkflowRecipe',
+ name: 'parent',
+ uid: 'uid-parent',
+ },
+ ])
+ expect(replaceArgs.body.metadata.finalizers).toEqual(['clerum.io/workload-cleanup'])
})
it('fails closed before replacement when the identity precondition names a replacement object', async () => {
@@ -474,6 +492,41 @@ describe('ResourceService annotation merge — platform keys survive admin write
})
describe('ResourceService.mutateResource', () => {
+ it('preserves lifecycle metadata from the live object during a full replace', async () => {
+ const customApi = {
+ getNamespacedCustomObject: vi.fn().mockResolvedValue({
+ metadata: {
+ name: 'recipe-a',
+ namespace: 'sandbox-recipes',
+ resourceVersion: '21',
+ ownerReferences: [
+ { apiVersion: 'v1', kind: 'WorkflowRecipe', name: 'parent', uid: 'uid-parent' },
+ ],
+ finalizers: ['clerum.io/workload-cleanup'],
+ },
+ spec: { enabled: true },
+ }),
+ replaceNamespacedCustomObject: vi.fn().mockResolvedValue({}),
+ listNamespacedCustomObject: vi.fn(),
+ }
+ const service = new ResourceService(customApi as never, 'control-plane', {
+ workflowrecipes: 'sandbox-recipes',
+ })
+
+ await service.mutateResource(
+ 'workflowrecipes',
+ 'recipe-a',
+ current => ({ spec: { ...current.spec, enabled: false } }),
+ 'sandbox-recipes'
+ )
+
+ const metadata = customApi.replaceNamespacedCustomObject.mock.calls[0][0].body.metadata
+ expect(metadata.ownerReferences).toEqual([
+ { apiVersion: 'v1', kind: 'WorkflowRecipe', name: 'parent', uid: 'uid-parent' },
+ ])
+ expect(metadata.finalizers).toEqual(['clerum.io/workload-cleanup'])
+ })
+
it('recomputes the replacement body from the refetched resource after a conflict', async () => {
const customApi = {
getNamespacedCustomObject: vi
diff --git a/control-ui/components/CreateMcpServerForm/index.tsx b/control-ui/components/CreateMcpServerForm/index.tsx
index 2694cbe58..8b4bbdc81 100644
--- a/control-ui/components/CreateMcpServerForm/index.tsx
+++ b/control-ui/components/CreateMcpServerForm/index.tsx
@@ -22,6 +22,7 @@ import {
} from '@/lib/api'
import type { EnvSecretKeyMapping, EnvVar, OrgImage } from '@/lib/api'
import type { EgressBinding } from '@/lib/api'
+import type { SecretIdentity } from '@/lib/api'
import { buildContextUpdatePayload } from '@/lib/contextMutation'
import type { EgressEditorStatus } from '@/lib/egressModel'
import { EgressEditor } from '../EgressEditor'
@@ -532,11 +533,11 @@ export function CreateMcpServerForm({
const willCreateSecret =
useEnvSecret && envSecretName.trim().length > 0 && Object.keys(secretData).length > 0
- let secretCreated = false
+ let createdSecretIdentity: SecretIdentity | null = null
try {
if (willCreateSecret) {
- await createMcpSecret(envSecretName.trim(), secretData)
- secretCreated = true
+ const created = await createMcpSecret(envSecretName.trim(), secretData)
+ createdSecretIdentity = { uid: created.uid, resourceVersion: created.resourceVersion }
}
await createMcpServer({
@@ -577,9 +578,9 @@ export function CreateMcpServerForm({
} catch (submitError) {
// Rollback: if we created the Secret but the CRD (or anything after)
// failed, the Secret is orphan — best-effort delete.
- if (secretCreated) {
+ if (createdSecretIdentity) {
try {
- await deleteMcpSecret(envSecretName.trim())
+ await deleteMcpSecret(envSecretName.trim(), createdSecretIdentity)
} catch {
// best-effort rollback; swallow — the operator already sees the
// primary error below.
diff --git a/control-ui/components/RecipeSecretsPanel/index.tsx b/control-ui/components/RecipeSecretsPanel/index.tsx
index 9e2bec2ef..eca4d488f 100644
--- a/control-ui/components/RecipeSecretsPanel/index.tsx
+++ b/control-ui/components/RecipeSecretsPanel/index.tsx
@@ -5,6 +5,7 @@ import { useRouter } from 'next/navigation'
import { CONTROL_ROUTES } from '@constants/routes'
import {
type RecipeSecretItem,
+ type SecretIdentity,
deleteRecipeSecret,
getRecipe,
getRecipeSecrets,
@@ -29,6 +30,8 @@ type Row = {
keys: string[]
status: RecipeSecretStatus
ownership: RowOwnership
+ uid?: string
+ resourceVersion?: string
}
const DEFAULT_RECIPE_SECRET_NAMESPACE = 'sandbox-recipes'
@@ -83,6 +86,8 @@ export function RecipeSecretsPanel({
keys: Array.isArray(provisioned.keys) ? provisioned.keys : [],
status: 'provisioned',
ownership: provisioned.ownership ?? { kind: 'unlabeled' },
+ uid: provisioned.uid,
+ resourceVersion: provisioned.resourceVersion,
})
} else {
next.push({
@@ -131,7 +136,12 @@ export function RecipeSecretsPanel({
router.push(CONTROL_ROUTES.secrets.new({ scope: 'recipe' }))
}
- async function deleteRow(name: string, namespace: string) {
+ async function deleteRow(row: Row) {
+ const { name, namespace, uid, resourceVersion } = row
+ if (!uid || !resourceVersion) {
+ setError(`Secret ${name} has no current identity; refresh before deleting it.`)
+ return
+ }
const shouldDelete = await confirm({
title: 'Delete Recipe Secret',
message: `Delete recipe secret ${name} from ${namespace}?`,
@@ -144,7 +154,7 @@ export function RecipeSecretsPanel({
setDeletingName(deleteKey)
setError('')
try {
- await deleteRecipeSecret(name, namespace)
+ await deleteRecipeSecret(name, namespace, { uid, resourceVersion } satisfies SecretIdentity)
showToast(`Secret ${name} deleted.`, { tone: 'success' })
await load()
} catch (e) {
@@ -287,8 +297,12 @@ export function RecipeSecretsPanel({
<button
type="button"
className="cu-btn cu-btn--icon cu-btn--danger-icon"
- onClick={() => void deleteRow(row.name, row.namespace)}
- disabled={deletingName === `${row.namespace}/${row.name}`}
+ onClick={() => void deleteRow(row)}
+ disabled={
+ !row.uid ||
+ !row.resourceVersion ||
+ deletingName === `${row.namespace}/${row.name}`
+ }
aria-label={
deletingName === `${row.namespace}/${row.name}`
? 'Deleting…'
diff --git a/control-ui/components/SecretsTable.tsx b/control-ui/components/SecretsTable.tsx
index 4a7f19b49..70f9bf083 100644
--- a/control-ui/components/SecretsTable.tsx
+++ b/control-ui/components/SecretsTable.tsx
@@ -5,6 +5,7 @@ import { useRouter } from 'next/navigation'
import { CONTROL_ROUTES } from '@constants/routes'
import {
type RecipeSecretItem,
+ type SecretIdentity,
apiSend,
deleteRecipeSecret,
getMcpServers,
@@ -56,6 +57,8 @@ type RecipeSecretRow = {
recipes: string[]
status: RecipeSecretStatus
ownership: RecipeSecretRowOwnership
+ uid?: string
+ resourceVersion?: string
}
const DEFAULT_RECIPE_SECRET_NAMESPACE = 'sandbox-recipes'
@@ -382,6 +385,8 @@ export function SecretsTable({
).sort((a, b) => a.localeCompare(b)),
status: 'provisioned',
ownership: item.ownership ?? { kind: 'unlabeled' },
+ uid: item.uid,
+ resourceVersion: item.resourceVersion,
}))
const missingRows: RecipeSecretRow[] = Array.from(usage.entries())
@@ -454,7 +459,12 @@ export function SecretsTable({
router.push(CONTROL_ROUTES.secrets.editRecipe(name, Object.fromEntries(qs)))
}
- async function deleteRecipeSecretRow(name: string, namespace: string) {
+ async function deleteRecipeSecretRow(row: RecipeSecretRow) {
+ const { name, namespace, uid, resourceVersion } = row
+ if (!uid || !resourceVersion) {
+ setRecipeError(`Secret ${name} has no current identity; refresh before deleting it.`)
+ return
+ }
const ok = await confirm({
title: 'Delete Recipe Secret',
message: `Delete recipe secret ${name} from ${namespace}?`,
@@ -466,7 +476,7 @@ export function SecretsTable({
setRecipeDeletingName(deleteKey)
setRecipeError('')
try {
- await deleteRecipeSecret(name, namespace)
+ await deleteRecipeSecret(name, namespace, { uid, resourceVersion } satisfies SecretIdentity)
showToast(`Secret ${name} deleted.`, { tone: 'success' })
await loadRecipeSecretsAndUsage()
} catch (e) {
@@ -931,8 +941,12 @@ export function SecretsTable({
<button
type="button"
className="cu-btn cu-btn--icon cu-btn--danger-icon"
- onClick={() => void deleteRecipeSecretRow(row.name, row.namespace)}
- disabled={recipeDeletingName === `${row.namespace}/${row.name}`}
+ onClick={() => void deleteRecipeSecretRow(row)}
+ disabled={
+ !row.uid ||
+ !row.resourceVersion ||
+ recipeDeletingName === `${row.namespace}/${row.name}`
+ }
aria-label={
recipeDeletingName === `${row.namespace}/${row.name}`
? 'Deleting…'
diff --git a/control-ui/components/__tests__/CreateMcpServerForm.test.tsx b/control-ui/components/__tests__/CreateMcpServerForm.test.tsx
index 1739dbf00..de743c2a9 100644
--- a/control-ui/components/__tests__/CreateMcpServerForm.test.tsx
+++ b/control-ui/components/__tests__/CreateMcpServerForm.test.tsx
@@ -14,7 +14,12 @@ vi.mock('../../lib/api', async () => {
})
return {
createMcpServer: vi.fn().mockResolvedValue({ metadata: { name: 'test-server' } }),
- createMcpSecret: vi.fn().mockResolvedValue({ name: 'test-credentials' }),
+ createMcpSecret: vi.fn().mockResolvedValue({
+ name: 'test-credentials',
+ namespace: 'mcp-server',
+ uid: 'uid-test-credentials',
+ resourceVersion: '1',
+ }),
deleteMcpSecret: vi.fn().mockResolvedValue({ name: 'test-credentials' }),
getContexts: vi.fn().mockResolvedValue(
buildContextList([
@@ -523,7 +528,10 @@ describe('CreateMcpServerForm — envSecret guardrails', () => {
await waitFor(() => {
expect(api.deleteMcpSecret).toHaveBeenCalledTimes(1)
})
- expect(api.deleteMcpSecret).toHaveBeenCalledWith('brave-credentials')
+ expect(api.deleteMcpSecret).toHaveBeenCalledWith('brave-credentials', {
+ uid: 'uid-test-credentials',
+ resourceVersion: '1',
+ })
// JSON API errors surface their server message after rollback.
await waitFor(() => {
diff --git a/control-ui/components/__tests__/RecipeSecretsPanel.test.tsx b/control-ui/components/__tests__/RecipeSecretsPanel.test.tsx
index febaa3a5b..94ca2a5d9 100644
--- a/control-ui/components/__tests__/RecipeSecretsPanel.test.tsx
+++ b/control-ui/components/__tests__/RecipeSecretsPanel.test.tsx
@@ -69,6 +69,8 @@ const provisionedSecret: RecipeSecretItem = {
namespace: 'sandbox-recipes',
keys: ['apiKey', 'dbPassword'],
ownership: { kind: 'owner-recipe', recipeName: 'operator-secret-recipe' },
+ uid: 'uid-operator-api-credentials',
+ resourceVersion: '7',
}
function mockRecipeSecrets(items: RecipeSecretItem[]) {
diff --git a/control-ui/lib/api.ts b/control-ui/lib/api.ts
index 84ba05af0..408db70be 100644
--- a/control-ui/lib/api.ts
+++ b/control-ui/lib/api.ts
@@ -8,6 +8,24 @@ import {
export type AnyRecord = Record<string, unknown>
+export type SecretIdentity = {
+ uid: string
+ resourceVersion: string
+}
+
+function requireSecretIdentity(raw: unknown, operation: string): SecretIdentity {
+ const value = (raw ?? {}) as { uid?: unknown; resourceVersion?: unknown }
+ if (
+ typeof value.uid !== 'string' ||
+ !value.uid.trim() ||
+ typeof value.resourceVersion !== 'string' ||
+ !value.resourceVersion.trim()
+ ) {
+ throw new Error(`${operation} returned an incomplete Secret identity; repair is required`)
+ }
+ return { uid: value.uid, resourceVersion: value.resourceVersion }
+}
+
// Global error handler for 401s - managed by AuthContext
let globalHandleAuthError: (() => void) | null = null
@@ -1448,10 +1466,15 @@ export async function updateMcpServer(name: string, payload: { spec: Record<stri
}
export async function createMcpSecret(name: string, data: Record<string, string>) {
- return apiSend('POST', '/api/v1/admin/mcp-secrets', { name, data }) as Promise<{
+ const response = await apiSend('POST', '/api/v1/admin/mcp-secrets', { name, data })
+ const identity = requireSecretIdentity(response, 'createMcpSecret')
+ return {
+ ...(response as { name: string; namespace: string }),
+ ...identity,
+ } as {
name: string
namespace: string
- }>
+ } & SecretIdentity
}
/**
@@ -1460,8 +1483,12 @@ export async function createMcpSecret(name: string, data: Record<string, string>
* back a just-created Secret when the subsequent McpServer CRD creation fails,
* so we never leave orphan Secrets behind.
*/
-export async function deleteMcpSecret(name: string) {
- return apiSend('DELETE', `/api/v1/admin/mcp-secrets/${encodeURIComponent(name)}`) as Promise<{
+export async function deleteMcpSecret(name: string, identity: SecretIdentity) {
+ return apiSend(
+ 'DELETE',
+ `/api/v1/admin/mcp-secrets/${encodeURIComponent(name)}`,
+ identity
+ ) as Promise<{
name: string
namespace: string
}>
@@ -1500,6 +1527,8 @@ export type RecipeSecretItem = {
namespace: string
keys: string[]
ownership: RecipeSecretOwnership
+ uid?: string
+ resourceVersion?: string
}
export async function getRecipeSecrets() {
@@ -1517,12 +1546,14 @@ export async function createRecipeSecret(
data,
ownership,
...(targetNamespace ? { targetNamespace } : {}),
- }) as Promise<{
- name: string
- namespace: string
- ownership: RecipeSecretOwnership
- created: boolean
- }>
+ }) as Promise<
+ {
+ name: string
+ namespace: string
+ ownership: RecipeSecretOwnership
+ created: boolean
+ } & SecretIdentity
+ >
}
export async function updateRecipeSecret(
@@ -1539,9 +1570,17 @@ export async function updateRecipeSecret(
})
}
-export async function deleteRecipeSecret(name: string, targetNamespace?: string) {
+export async function deleteRecipeSecret(
+ name: string,
+ targetNamespace: string | undefined,
+ identity: SecretIdentity
+) {
const qs = targetNamespace ? `?targetNamespace=${encodeURIComponent(targetNamespace)}` : ''
- return apiSend('DELETE', `/api/v1/admin/recipe-secrets/${encodeURIComponent(name)}${qs}`)
+ return apiSend(
+ 'DELETE',
+ `/api/v1/admin/recipe-secrets/${encodeURIComponent(name)}${qs}`,
+ identity
+ )
}
// ── LLM model prices (token-budgets P0b) ──────────────────────────────────
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 4ac83d4a1..accdf57c0 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.450",
+ "version": "0.1.451",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.450",
+ "version": "0.1.451",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/llm-providers": "file:../packages/llm-providers",
diff --git a/control-ui/package.json b/control-ui/package.json
index 5fef329e3..1efd79c00 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.450",
+ "version": "0.1.451",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",