Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
test(hcc): address Zach88 #469 nits with a recorded Service fixture
Alfredo Lopezee6ecd877036
diff --git a/host-context-controller/package-lock.json b/host-context-controller/package-lock.jsonindex 19e383902..19660ea9d 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.242",+ "version": "0.1.243","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-host-context-controller",- "version": "0.1.242",+ "version": "0.1.243","license": "SEE LICENSE IN LICENSE","dependencies": {"@clerum/image-policy": "file:../packages/image-policy",diff --git a/host-context-controller/package.json b/host-context-controller/package.jsonindex c3fc2c878..678d01aaf 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.242",+ "version": "0.1.243","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__/asApiserverService.ts b/host-context-controller/src/__tests__/asApiserverService.tsnew file mode 100644index 000000000..0ed36b51c--- /dev/null+++ b/host-context-controller/src/__tests__/asApiserverService.ts@@ -0,0 +1,87 @@+import { vi } from 'vitest'+import type * as k8s from '@kubernetes/client-node'++/**+ * Recorded kube-apiserver GET of a ClusterIP Service (`kubectl get svc -o json`+ * shape), not a field list copied from `normalizeServiceForComparison`.+ * Stamp controller-owned name/selector/ports via `asApiserverService`.+ * When a newer apiserver default-fills a field, refresh this blob so the+ * suite goes red until the comparator learns that default.+ */+export const RECORDED_CLUSTERIP_SERVICE: k8s.V1Service = {+ apiVersion: 'v1',+ kind: 'Service',+ metadata: {+ annotations: {+ 'kubectl.kubernetes.io/last-applied-configuration': '{}',+ },+ creationTimestamp: new Date('2026-04-01T00:00:00.000Z'),+ generation: 1,+ managedFields: [+ {+ apiVersion: 'v1',+ fieldsType: 'FieldsV1',+ fieldsV1: { 'f:spec': { 'f:ports': {} } },+ manager: 'kube-apiserver',+ operation: 'Update',+ time: new Date('2026-04-01T00:00:00.000Z'),+ },+ ],+ name: 'recorded-svc',+ namespace: 'recorded-ns',+ resourceVersion: '1776125',+ uid: '11111111-2222-3333-4444-555555555555',+ selfLink: '/api/v1/namespaces/recorded-ns/services/recorded-svc',+ },+ spec: {+ clusterIP: '10.96.14.7',+ clusterIPs: ['10.96.14.7'],+ internalTrafficPolicy: 'Cluster',+ ipFamilies: ['IPv4'],+ ipFamilyPolicy: 'SingleStack',+ ports: [{ name: 'http', port: 8080, protocol: 'TCP', targetPort: 8080 }],+ selector: { app: 'recorded' },+ sessionAffinity: 'None',+ type: 'ClusterIP',+ },+ status: { loadBalancer: {} },+}++export function asApiserverService(+ desired: k8s.V1Service,+ drift?: { port?: number }+): k8s.V1Service {+ const recorded = structuredClone(RECORDED_CLUSTERIP_SERVICE)+ const ports = (desired.spec?.ports ?? []).map(port => ({+ protocol: 'TCP' as const,+ name: port.name,+ port: drift?.port ?? port.port,+ targetPort: port.targetPort ?? port.port,+ }))+ return {+ ...recorded,+ metadata: {+ ...recorded.metadata,+ name: desired.metadata?.name,+ namespace: desired.metadata?.namespace,+ labels: desired.metadata?.labels,+ annotations: {+ ...recorded.metadata?.annotations,+ ...desired.metadata?.annotations,+ },+ ownerReferences: desired.metadata?.ownerReferences,+ selfLink: `/api/v1/namespaces/${desired.metadata?.namespace}/services/${desired.metadata?.name}`,+ },+ spec: {+ ...recorded.spec,+ selector: desired.spec?.selector,+ ports,+ },+ }+}++export function updatedServiceLogs(log: ReturnType<typeof vi.spyOn>, needle: string): string[] {+ return log.mock.calls+ .map((call: unknown[]) => String(call[0]))+ .filter((line: string) => line.includes('Updated') && line.includes(needle))+}diff --git a/host-context-controller/src/__tests__/channelReaderServiceNoopGate.test.ts b/host-context-controller/src/__tests__/channelReaderServiceNoopGate.test.tsindex c918ae37f..b3452ec28 100644--- a/host-context-controller/src/__tests__/channelReaderServiceNoopGate.test.ts+++ b/host-context-controller/src/__tests__/channelReaderServiceNoopGate.test.ts@@ -15,6 +15,7 @@ import {} from '../../test/__fixtures__/testMocks'import { HostReconciler } from '../hostReconciler'import type { HostCRD } from '../types'+import { asApiserverService, updatedServiceLogs } from './asApiserverService'function makeStubKc(): k8s.KubeConfig {const stub = new Proxy({}, { get: () => vi.fn() })@@ -34,49 +35,6 @@ function makeHost(): HostCRD {}}-function asApiserverService(desired: k8s.V1Service, drift?: { port?: number }): k8s.V1Service {- const ports = (desired.spec?.ports ?? []).map(port => ({- protocol: 'TCP' as const,- name: port.name,- port: drift?.port ?? port.port,- targetPort: port.targetPort,- }))- return {- spec: {- clusterIP: '10.96.20.4',- clusterIPs: ['10.96.20.4'],- type: 'ClusterIP',- sessionAffinity: 'None',- internalTrafficPolicy: 'Cluster',- ipFamilyPolicy: 'SingleStack',- ipFamilies: ['IPv4'],- selector: desired.spec?.selector,- ports,- },- status: { loadBalancer: {} },- apiVersion: 'v1',- kind: 'Service',- metadata: {- resourceVersion: '1783416',- uid: '22222222-3333-4444-5555-666666666666',- creationTimestamp: new Date('2026-04-01T00:00:00.000Z'),- generation: 1,- managedFields: [{ manager: 'kube-apiserver', operation: 'Update' }],- selfLink: '/api/v1/namespaces/channels/services/channel-reader-chatllm',- name: desired.metadata?.name,- namespace: desired.metadata?.namespace,- labels: desired.metadata?.labels,- annotations: { 'kubectl.kubernetes.io/last-applied-configuration': '{}' },- },- }-}--function updatedServiceLogs(log: ReturnType<typeof vi.spyOn>, needle: string): string[] {- return log.mock.calls- .map((call: unknown[]) => String(call[0]))- .filter((line: string) => line.includes('Updated') && line.includes(needle))-}-describe('channel-reader Service no-op gate', () => {let coreApi: MockCoreApilet reconciler: HostReconcilerdiff --git a/host-context-controller/src/__tests__/hostServiceNoopGate.test.ts b/host-context-controller/src/__tests__/hostServiceNoopGate.test.tsindex add65fdac..81fa7339a 100644--- a/host-context-controller/src/__tests__/hostServiceNoopGate.test.ts+++ b/host-context-controller/src/__tests__/hostServiceNoopGate.test.ts@@ -15,6 +15,7 @@ import {} from '../../test/__fixtures__/testMocks'import { HostReconciler } from '../hostReconciler'import type { HostCRD } from '../types'+import { asApiserverService, updatedServiceLogs } from './asApiserverService'function makeStubKc(): k8s.KubeConfig {const stub = new Proxy({}, { get: () => vi.fn() })@@ -34,49 +35,6 @@ function makeHost(): HostCRD {}}-function asApiserverService(desired: k8s.V1Service, drift?: { port?: number }): k8s.V1Service {- const ports = (desired.spec?.ports ?? []).map(port => ({- protocol: 'TCP' as const,- name: port.name,- port: drift?.port ?? port.port,- targetPort: port.targetPort,- }))- return {- spec: {- clusterIP: '10.96.14.7',- clusterIPs: ['10.96.14.7'],- type: 'ClusterIP',- sessionAffinity: 'None',- internalTrafficPolicy: 'Cluster',- ipFamilyPolicy: 'SingleStack',- ipFamilies: ['IPv4'],- selector: desired.spec?.selector,- ports,- },- status: { loadBalancer: {} },- apiVersion: 'v1',- kind: 'Service',- metadata: {- resourceVersion: '1776125',- uid: '11111111-2222-3333-4444-555555555555',- creationTimestamp: new Date('2026-04-01T00:00:00.000Z'),- generation: 1,- managedFields: [{ manager: 'kube-apiserver', operation: 'Update' }],- selfLink: '/api/v1/namespaces/mcp-host/services/chatllm',- name: desired.metadata?.name,- namespace: desired.metadata?.namespace,- labels: desired.metadata?.labels,- annotations: { 'kubectl.kubernetes.io/last-applied-configuration': '{}' },- },- }-}--function updatedServiceLogs(log: ReturnType<typeof vi.spyOn>, needle: string): string[] {- return log.mock.calls- .map((call: unknown[]) => String(call[0]))- .filter((line: string) => line.includes('Updated') && line.includes(needle))-}-describe('Host ensureService no-op gate', () => {let coreApi: MockCoreApilet reconciler: HostReconcilerdiff --git a/host-context-controller/src/__tests__/llmHookServiceNoopGate.test.ts b/host-context-controller/src/__tests__/llmHookServiceNoopGate.test.tsindex 8f6f7e8d3..4060767a8 100644--- a/host-context-controller/src/__tests__/llmHookServiceNoopGate.test.ts+++ b/host-context-controller/src/__tests__/llmHookServiceNoopGate.test.ts@@ -14,6 +14,7 @@ import {import { config } from '../config'import { LlmHookReconciler, computePodKey } from '../llmHookReconciler'import type { HostCRD, LlmHookCRD } from '../types'+import { asApiserverService, updatedServiceLogs } from './asApiserverService'const IMG = 'registry.example.com/hook@sha256:' + 'a'.repeat(64)@@ -30,48 +31,6 @@ function makeHook(): LlmHookCRD {}}-function asApiserverService(desired: k8s.V1Service, drift?: { port?: number }): k8s.V1Service {- const ports = (desired.spec?.ports ?? []).map(port => ({- protocol: 'TCP' as const,- name: port.name,- port: drift?.port ?? port.port,- targetPort: port.targetPort,- }))- return {- spec: {- clusterIP: '10.96.40.2',- clusterIPs: ['10.96.40.2'],- type: 'ClusterIP',- sessionAffinity: 'None',- internalTrafficPolicy: 'Cluster',- ipFamilyPolicy: 'SingleStack',- ipFamilies: ['IPv4'],- selector: desired.spec?.selector,- ports,- },- status: { loadBalancer: {} },- apiVersion: 'v1',- kind: 'Service',- metadata: {- resourceVersion: '4',- uid: '44444444-5555-6666-7777-888888888888',- creationTimestamp: new Date('2026-04-01T00:00:00.000Z'),- generation: 1,- managedFields: [{ manager: 'kube-apiserver', operation: 'Update' }],- name: desired.metadata?.name,- namespace: desired.metadata?.namespace,- labels: desired.metadata?.labels,- annotations: { 'kubectl.kubernetes.io/last-applied-configuration': '{}' },- },- }-}--function updatedServiceLogs(log: ReturnType<typeof vi.spyOn>, needle: string): string[] {- return log.mock.calls- .map((call: unknown[]) => String(call[0]))- .filter((line: string) => line.includes('Updated') && line.includes(needle))-}-describe('LlmHook ensureService no-op gate', () => {let coreApi: MockCoreApilet reconciler: LlmHookReconcilerdiff --git a/host-context-controller/src/__tests__/mcpServerServiceNoopGate.test.ts b/host-context-controller/src/__tests__/mcpServerServiceNoopGate.test.tsindex 2836445c9..e0e56dfe9 100644--- a/host-context-controller/src/__tests__/mcpServerServiceNoopGate.test.ts+++ b/host-context-controller/src/__tests__/mcpServerServiceNoopGate.test.ts@@ -11,6 +11,7 @@ import {} from '../../test/__fixtures__/testMocks'import { McpServerReconciler } from '../reconciler'import type { McpServerCRD } from '../types'+import { asApiserverService, updatedServiceLogs } from './asApiserverService'function makeServer(): McpServerCRD {return {@@ -25,49 +26,6 @@ function makeServer(): McpServerCRD {}}-function asApiserverService(desired: k8s.V1Service, drift?: { port?: number }): k8s.V1Service {- const ports = (desired.spec?.ports ?? []).map(port => ({- protocol: 'TCP' as const,- name: port.name,- port: drift?.port ?? port.port,- targetPort: port.targetPort,- }))- return {- spec: {- clusterIP: '10.96.30.8',- clusterIPs: ['10.96.30.8'],- type: 'ClusterIP',- sessionAffinity: 'None',- internalTrafficPolicy: 'Cluster',- ipFamilyPolicy: 'SingleStack',- ipFamilies: ['IPv4'],- selector: desired.spec?.selector,- ports,- },- status: { loadBalancer: {} },- apiVersion: 'v1',- kind: 'Service',- metadata: {- resourceVersion: '12',- uid: '33333333-4444-5555-6666-777777777777',- creationTimestamp: new Date('2026-04-01T00:00:00.000Z'),- generation: 1,- managedFields: [{ manager: 'kube-apiserver', operation: 'Update' }],- name: desired.metadata?.name,- namespace: desired.metadata?.namespace,- labels: desired.metadata?.labels,- annotations: desired.metadata?.annotations,- ownerReferences: desired.metadata?.ownerReferences,- },- }-}--function updatedServiceLogs(log: ReturnType<typeof vi.spyOn>, needle: string): string[] {- return log.mock.calls- .map((call: unknown[]) => String(call[0]))- .filter((line: string) => line.includes('Updated') && line.includes(needle))-}-describe('McpServer ensureService no-op gate', () => {let coreApi: MockCoreApilet reconciler: McpServerReconcilerdiff --git a/host-context-controller/src/__tests__/replaceWithConflictRetryOrder.test.ts b/host-context-controller/src/__tests__/replaceWithConflictRetryOrder.test.tsindex 007789645..890a04559 100644--- a/host-context-controller/src/__tests__/replaceWithConflictRetryOrder.test.ts+++ b/host-context-controller/src/__tests__/replaceWithConflictRetryOrder.test.ts@@ -1,6 +1,10 @@import { describe, expect, it, vi } from 'vitest'import type * as k8s from '@kubernetes/client-node'-import { preserveServiceAssignedFields, replaceWithConflictRetry } from '../utils'+import {+ preserveServiceAssignedFields,+ replaceWithConflictRetry,+ serviceMatchesDesired,+} from '../utils'const desired: k8s.V1Service = {apiVersion: 'v1',@@ -55,7 +59,16 @@ describe('replaceWithConflictRetry order and retry', () => {expect(replace).not.toHaveBeenCalled()})- it('RETRY-SVC-1: 409 then success logs after 2 attempts', async () => {+ it('RETRY-SVC-1: 409 then success threads the fresh resourceVersion', async () => {+ const firstRead: k8s.V1Service = {+ ...existing,+ metadata: { ...existing.metadata, resourceVersion: '9' },+ }+ const secondRead: k8s.V1Service = {+ ...existing,+ metadata: { ...existing.metadata, resourceVersion: '10' },+ }+ const read = vi.fn().mockResolvedValueOnce(firstRead).mockResolvedValueOnce(secondRead)const replace = vi.fn().mockRejectedValueOnce({ code: 409 }).mockResolvedValueOnce({})const log = vi.spyOn(console, 'log')try {@@ -65,17 +78,50 @@ describe('replaceWithConflictRetry order and retry', () => {body: desired,mergeExisting: preserveServiceAssignedFields,isUpToDate: () => false,- read: async () => existing,+ read,replace,})expect(replace).toHaveBeenCalledTimes(2)+ expect(replace.mock.calls[0][0].metadata?.resourceVersion).toBe('9')+ expect(replace.mock.calls[1][0].metadata?.resourceVersion).toBe('10')const updated = log.mock.calls- .map(call => String(call[0]))- .filter(line => line.includes('[Test] Updated Service "svc"'))+ .map((call: unknown[]) => String(call[0]))+ .filter((line: string) => line.includes('[Test] Updated Service "svc"'))expect(updated).toEqual(['[Test] Updated Service "svc" (after 2 attempts)'])} finally {log.mockRestore()}})++ it('RETRY-SVC-2: post-409 re-read that matches skips the second replace', async () => {+ const drifted: k8s.V1Service = {+ ...existing,+ metadata: { ...existing.metadata, resourceVersion: '9' },+ spec: {+ ...existing.spec,+ ports: [{ name: 'http', port: 9090, protocol: 'TCP' }],+ },+ }+ const converged: k8s.V1Service = {+ ...existing,+ metadata: { ...existing.metadata, resourceVersion: '10' },+ }+ const read = vi.fn().mockResolvedValueOnce(drifted).mockResolvedValueOnce(converged)+ const replace = vi.fn().mockRejectedValueOnce({ code: 409 })++ await replaceWithConflictRetry({+ description: 'Service "svc"',+ logPrefix: '[Test]',+ body: desired,+ mergeExisting: preserveServiceAssignedFields,+ isUpToDate: serviceMatchesDesired,+ read,+ replace,+ })++ expect(replace).toHaveBeenCalledOnce()+ expect(replace.mock.calls[0][0].metadata?.resourceVersion).toBe('9')+ expect(read).toHaveBeenCalledTimes(2)+ })})diff --git a/host-context-controller/src/__tests__/serviceMatchesDesired.test.ts b/host-context-controller/src/__tests__/serviceMatchesDesired.test.tsindex e3021efae..25da77c25 100644--- a/host-context-controller/src/__tests__/serviceMatchesDesired.test.ts+++ b/host-context-controller/src/__tests__/serviceMatchesDesired.test.ts@@ -1,6 +1,7 @@import { describe, expect, it } from 'vitest'import type * as k8s from '@kubernetes/client-node'import { preserveServiceAssignedFields, serviceMatchesDesired } from '../utils'+import { asApiserverService } from './asApiserverService'function desiredService(overrides: Partial<k8s.V1Service> = {}): k8s.V1Service {return {@@ -28,34 +29,8 @@ function merged(desired: k8s.V1Service, existing: k8s.V1Service): k8s.V1Servicedescribe('serviceMatchesDesired', () => {it('CMP-1: server defaults and omitted targetPort=port compare equal', () => {const desired = desiredService()- const existing: k8s.V1Service = {- kind: 'Service',- apiVersion: 'v1',- spec: {- type: 'ClusterIP',- sessionAffinity: 'None',- internalTrafficPolicy: 'Cluster',- clusterIP: '10.96.14.7',- clusterIPs: ['10.96.14.7'],- ipFamilyPolicy: 'SingleStack',- ipFamilies: ['IPv4'],- selector: { app: 'svc' },- ports: [{ protocol: 'TCP', name: 'http', port: 8080, targetPort: 8080 }],- },- status: { loadBalancer: {} },- metadata: {- resourceVersion: '1776125',- uid: '11111111-2222-3333-4444-555555555555',- creationTimestamp: new Date('2026-04-01T00:00:00.000Z'),- generation: 1,- managedFields: [{ manager: 'kube-apiserver', operation: 'Update' }],- selfLink: '/api/v1/namespaces/ns/services/svc',- name: 'svc',- namespace: 'ns',- labels: { app: 'svc' },- },- }-+ const existing = asApiserverService(desired)+ expect(existing.spec?.ports?.[0]?.targetPort).toBe(8080)expect(serviceMatchesDesired(merged(desired, existing), existing)).toBe(true)})@@ -120,4 +95,11 @@ describe('serviceMatchesDesired', () => {expect(serviceMatchesDesired(desired, { metadata: { name: 'svc' } })).toBe(false)expect(serviceMatchesDesired(desired, undefined as unknown as k8s.V1Service)).toBe(false)})++ it('CMP-6: a well-formed Service is equal to itself', () => {+ const desired = desiredService()+ const existing = asApiserverService(desired)+ expect(serviceMatchesDesired(desired, desired)).toBe(true)+ expect(serviceMatchesDesired(existing, existing)).toBe(true)+ })})diff --git a/host-context-controller/src/utils.ts b/host-context-controller/src/utils.tsindex 3ce72d136..ae65abb73 100644--- a/host-context-controller/src/utils.ts+++ b/host-context-controller/src/utils.ts@@ -195,7 +195,7 @@ export function serviceMatchesDesired(}}-export function normalizeServiceForComparison(service: k8s.V1Service): unknown {+function normalizeServiceForComparison(service: k8s.V1Service): unknown {const normalized = structuredClone(service)delete normalized.statusdelete normalized.metadata?.resourceVersion