Skip to content

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

TypeScript

fix(reconciler): gate and conflict-retry the nginx ConfigMap write

Alfredo Lopez95c4f1b817ad
diff --git a/host-context-controller/package-lock.json b/host-context-controller/package-lock.json
index 4aad3ee06..e95f499c7 100644
--- a/host-context-controller/package-lock.json
+++ b/host-context-controller/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-host-context-controller",
- "version": "0.1.276",
+ "version": "0.1.277",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-host-context-controller",
- "version": "0.1.276",
+ "version": "0.1.277",
"license": "SEE LICENSE IN LICENSE",
"dependencies": {
"@clerum/codex-catalog-projection": "file:../packages/codex-catalog-projection",
diff --git a/host-context-controller/package.json b/host-context-controller/package.json
index 4ecd8e77e..4aa6b6b18 100644
--- a/host-context-controller/package.json
+++ b/host-context-controller/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-host-context-controller",
- "version": "0.1.276",
+ "version": "0.1.277",
"description": "Host Context Controller - provides McpServer CRDs to mcp-host via REST API",
"main": "dist/main.js",
"engines": {
diff --git a/host-context-controller/src/__tests__/mcpServerConfigMapNoopGate.test.ts b/host-context-controller/src/__tests__/mcpServerConfigMapNoopGate.test.ts
new file mode 100644
index 000000000..6c1d0f423
--- /dev/null
+++ b/host-context-controller/src/__tests__/mcpServerConfigMapNoopGate.test.ts
@@ -0,0 +1,166 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as k8s from '@kubernetes/client-node'
+import {
+ type MockCoreApi,
+ asAppsApi,
+ asCoreApi,
+ asCustomApi,
+ createMockAppsApi,
+ createMockCoreApi,
+ createMockCustomApi,
+} from '../../test/__fixtures__/testMocks'
+import { updatedLogs } from '../../test/__fixtures__/updatedLogs'
+import { McpServerReconciler } from '../reconciler'
+import type { McpServerCRD } from '../types'
+import { configMapMatchesDesired } from '../utils'
+
+vi.mock('../config', () => ({
+ config: {
+ devMode: false,
+ port: 8081,
+ namespace: 'mcp-server',
+ hostNamespace: 'mcp-host',
+ mcpServerImagePullPolicy: 'IfNotPresent',
+ egressProxyImage: 'clerum/nginx-egress-proxy:0.1.0',
+ stdioBridgeImage: 'clerum/stdio-bridge:test',
+ stdioBridgeResources: {
+ requests: { cpu: '50m', memory: '64Mi' },
+ limits: { cpu: '200m', memory: '128Mi' },
+ },
+ devMcpServers: [],
+ devContexts: [],
+ devAuthTokens: new Map(),
+ },
+}))
+
+function makeRemoteServer(): McpServerCRD {
+ return {
+ name: 'mcp-sentry-remote',
+ namespace: 'mcp-server',
+ uid: 'test-uid-123',
+ spec: {
+ contextRef: 'context1',
+ image: 'clerum/nginx-egress-proxy:0.1.0',
+ transport: { type: 'streamableHttp', port: 3000 },
+ remote: { baseUrl: 'https://mcp.sentry.io/sse' },
+ },
+ }
+}
+
+function asApiserverConfigMap(
+ desired: k8s.V1ConfigMap,
+ drift?: { template?: string }
+): k8s.V1ConfigMap {
+ return {
+ ...desired,
+ metadata: {
+ ...desired.metadata,
+ resourceVersion: '42',
+ uid: 'cm-uid',
+ creationTimestamp: new Date('2026-04-01T00:00:00.000Z'),
+ },
+ data: {
+ ...desired.data,
+ ...(drift?.template !== undefined ? { 'default.conf.template': drift.template } : {}),
+ },
+ }
+}
+
+describe('McpServer nginx ConfigMap no-op gate', () => {
+ let coreApi: MockCoreApi
+ let reconciler: McpServerReconciler
+ const server = makeRemoteServer()
+
+ beforeEach(() => {
+ coreApi = createMockCoreApi()
+ reconciler = new McpServerReconciler({} as k8s.KubeConfig, {
+ assumeInventoryAuthorityWhenUnconfigured: true,
+ appsApi: asAppsApi(createMockAppsApi()),
+ coreApi: asCoreApi(coreApi),
+ customApi: asCustomApi(createMockCustomApi()),
+ })
+ coreApi.createNamespacedConfigMap.mockRejectedValue({ code: 409 })
+ })
+
+ it('returns false when either ConfigMap is missing (fail-open-to-write)', () => {
+ const desired = (reconciler as any).buildNginxConfigMap(server) as k8s.V1ConfigMap
+ expect(configMapMatchesDesired(undefined, desired)).toBe(false)
+ expect(configMapMatchesDesired(desired, undefined)).toBe(false)
+ })
+
+ it('CM-1: identical conf skips replace and Updated logs', async () => {
+ const desired = (reconciler as any).buildNginxConfigMap(server) as k8s.V1ConfigMap
+ coreApi.readNamespacedConfigMap.mockResolvedValue(asApiserverConfigMap(desired))
+ const log = vi.spyOn(console, 'log')
+ try {
+ await (reconciler as any).ensureConfigMap(server)
+ expect(coreApi.replaceNamespacedConfigMap).not.toHaveBeenCalled()
+ expect(updatedLogs(log, 'Updated', 'nginx ConfigMap')).toEqual([])
+ } finally {
+ log.mockRestore()
+ }
+ })
+
+ it('CM-2: a byte change in default.conf.template replaces once', async () => {
+ const desired = (reconciler as any).buildNginxConfigMap(server) as k8s.V1ConfigMap
+ coreApi.readNamespacedConfigMap.mockResolvedValue(
+ asApiserverConfigMap(desired, { template: '# drifted\n' })
+ )
+ const log = vi.spyOn(console, 'log')
+ try {
+ await (reconciler as any).ensureConfigMap(server)
+ expect(coreApi.replaceNamespacedConfigMap).toHaveBeenCalledOnce()
+ const body = (
+ coreApi.replaceNamespacedConfigMap.mock.calls[0][0] as { body: k8s.V1ConfigMap }
+ ).body
+ expect(body.data?.['default.conf.template']).toBe(desired.data?.['default.conf.template'])
+ expect(updatedLogs(log, 'Updated', 'nginx ConfigMap')).toEqual([
+ '[Reconciler] Updated nginx ConfigMap "mcp-sentry-remote-nginx-conf"',
+ ])
+ } finally {
+ log.mockRestore()
+ }
+ })
+
+ it('CM-3: replace 409 retries and succeeds', async () => {
+ const desired = (reconciler as any).buildNginxConfigMap(server) as k8s.V1ConfigMap
+ const drifted = asApiserverConfigMap(desired, { template: '# drifted\n' })
+ coreApi.readNamespacedConfigMap
+ .mockResolvedValueOnce({
+ ...drifted,
+ metadata: { ...drifted.metadata, resourceVersion: '42' },
+ })
+ .mockResolvedValueOnce({
+ ...drifted,
+ metadata: { ...drifted.metadata, resourceVersion: '43' },
+ })
+ coreApi.replaceNamespacedConfigMap
+ .mockRejectedValueOnce({ code: 409 })
+ .mockResolvedValueOnce({})
+
+ await (reconciler as any).ensureConfigMap(server)
+
+ expect(coreApi.replaceNamespacedConfigMap).toHaveBeenCalledTimes(2)
+ expect(
+ (coreApi.replaceNamespacedConfigMap.mock.calls[0][0] as { body: k8s.V1ConfigMap }).body
+ .metadata?.resourceVersion
+ ).toBe('42')
+ expect(
+ (coreApi.replaceNamespacedConfigMap.mock.calls[1][0] as { body: k8s.V1ConfigMap }).body
+ .metadata?.resourceVersion
+ ).toBe('43')
+ })
+
+ it('CM-4: isCurrent false skips replace after the gate', async () => {
+ const desired = (reconciler as any).buildNginxConfigMap(server) as k8s.V1ConfigMap
+ coreApi.readNamespacedConfigMap.mockResolvedValue(
+ asApiserverConfigMap(desired, { template: '# drifted\n' })
+ )
+ const isCurrent = vi.fn().mockReturnValueOnce(true).mockReturnValue(false)
+
+ await (reconciler as any).ensureConfigMap(server, isCurrent)
+
+ expect(coreApi.replaceNamespacedConfigMap).not.toHaveBeenCalled()
+ expect(isCurrent).toHaveBeenCalled()
+ })
+})
diff --git a/host-context-controller/src/reconciler.ts b/host-context-controller/src/reconciler.ts
index 8cf82d93b..76fe4cf3a 100644
--- a/host-context-controller/src/reconciler.ts
+++ b/host-context-controller/src/reconciler.ts
@@ -29,6 +29,7 @@ import { mcpserverMissingSecret } from './metrics'
import { McpServerCRD, McpServerStatus } from './types'
import {
canonicalStringify,
+ configMapMatchesDesired,
deploymentMatchesDesired,
getErrorCode,
preserveDeploymentAnnotations,
@@ -947,39 +948,28 @@ ${authHeaderLines ? '\n # ── Credential auth headers (envsubst-resolv
): Promise<void> {
const cm = this.buildNginxConfigMap(server)
if (!isCurrent()) return
+ const name = `${server.name}-nginx-conf`
+ const namespace = server.namespace
try {
await this.coreApi.createNamespacedConfigMap({
- namespace: server.namespace,
+ namespace,
body: cm,
})
- console.log(`[Reconciler] Created nginx ConfigMap "${server.name}-nginx-conf"`)
+ console.log(`[Reconciler] Created nginx ConfigMap "${name}"`)
} catch (error: unknown) {
- if (getErrorCode(error) === 409) {
- const existing = await this.coreApi.readNamespacedConfigMap({
- name: `${server.name}-nginx-conf`,
- namespace: server.namespace,
- })
- if (!isCurrent()) return
- const next = preserveObjectAnnotations(
- {
- ...cm,
- metadata: {
- ...cm.metadata,
- resourceVersion: existing.metadata?.resourceVersion,
- },
- },
- existing
- )
- if (!isCurrent()) return
- await this.coreApi.replaceNamespacedConfigMap({
- name: `${server.name}-nginx-conf`,
- namespace: server.namespace,
- body: next,
- })
- console.log(`[Reconciler] Updated nginx ConfigMap "${server.name}-nginx-conf"`)
- } else {
+ if (getErrorCode(error) !== 409) {
throw error
}
+ await replaceWithConflictRetry({
+ description: `nginx ConfigMap "${name}"`,
+ logPrefix: '[Reconciler]',
+ body: cm,
+ mergeExisting: preserveObjectAnnotations,
+ isUpToDate: configMapMatchesDesired,
+ mutationAllowed: isCurrent,
+ read: () => this.coreApi.readNamespacedConfigMap({ name, namespace }),
+ replace: body => this.coreApi.replaceNamespacedConfigMap({ name, namespace, body }),
+ })
}
}
diff --git a/host-context-controller/src/utils.ts b/host-context-controller/src/utils.ts
index b9415b8d9..7f0a5efe9 100644
--- a/host-context-controller/src/utils.ts
+++ b/host-context-controller/src/utils.ts
@@ -244,6 +244,33 @@ function normalizeServiceForComparison(service: k8s.V1Service): unknown {
return canonicalizeValue(normalized)
}
+/**
+ * True when the merged desired ConfigMap is equivalent to the live object.
+ * ConfigMaps have no apps/v1-style spec defaulting, so comparison is the
+ * whole object after stripping server-owned metadata. Doubt or a malformed
+ * object returns false (fail-open-to-write).
+ */
+export function configMapMatchesDesired(
+ desired: k8s.V1ConfigMap | undefined,
+ existing: k8s.V1ConfigMap | undefined
+): boolean {
+ try {
+ if (!desired || !existing) return false
+ return (
+ JSON.stringify(normalizeConfigMapForComparison(desired)) ===
+ JSON.stringify(normalizeConfigMapForComparison(existing))
+ )
+ } catch {
+ return false
+ }
+}
+
+function normalizeConfigMapForComparison(configMap: k8s.V1ConfigMap): unknown {
+ const normalized = structuredClone(configMap)
+ stripServerOwnedMetadata(normalized)
+ return canonicalizeValue(normalized)
+}
+
/**
* True when the desired NetworkPolicy is equivalent to the live object, so a
* replace would be a no-op. Canonicalize first: the apiserver default-fills