Skip to content

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

TypeScript

test(hcc): pin last-success timestamp and share inventory-changed message (#447)

Alfredo Lopezd5cb470dc73b
diff --git a/host-context-controller/package-lock.json b/host-context-controller/package-lock.json
index b75c7ef2b..9783bd956 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.236",
+ "version": "0.1.237",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-host-context-controller",
- "version": "0.1.236",
+ "version": "0.1.237",
"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.json
index b02f8befc..63f7ecdd8 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.236",
+ "version": "0.1.237",
"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/k8sClient.test.ts b/host-context-controller/src/k8sClient.test.ts
index 336361dba..ada7ccaa8 100644
--- a/host-context-controller/src/k8sClient.test.ts
+++ b/host-context-controller/src/k8sClient.test.ts
@@ -14,6 +14,7 @@ import {
listAllSharedFileSystems,
} from './k8sClient'
import { registry } from './metrics'
+import { DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE } from './networkPolicyReconciler'
import { ContextMapperServer } from './server'
import type { HostCRD, McpServerCRD } from './types'
@@ -344,6 +345,8 @@ vi.mock('./networkPolicyReconciler', async () => {
)
return {
sameContextDesiredRevision: actual.sameContextDesiredRevision,
+ DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE:
+ actual.DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE,
NetworkPolicyReconciler: class {
ensureDefaultPolicies = mocks.ensureDefaultPolicies
fullReconcile = mocks.netPolFullReconcile
@@ -4018,6 +4021,12 @@ describe('McpServerWatcher startup', () => {
expect(appliedContexts).toEqual(['current-context'])
expect(appliedServers).toEqual(['current-server'])
expect((watcher as any).initialConvergenceRetryAttempts.has('NetworkPolicy')).toBe(false)
+ expect(
+ await readInitialConvergenceMetric(
+ 'clerum_hcc_initial_convergence_last_success_timestamp_seconds',
+ 'NetworkPolicy'
+ )
+ ).toBeGreaterThan(successTimestampBefore)
errorSpy.mockRestore()
await watcher.stop()
})
@@ -4356,6 +4365,10 @@ describe('McpServerWatcher startup', () => {
;(watcher as any).contextCacheSynced = true
;(watcher as any).mcpServerCacheSynced = false
;(watcher as any).initialConvergenceRetryAttempts.set('NetworkPolicy', 2)
+ const successTimestampBefore = await readInitialConvergenceMetric(
+ 'clerum_hcc_initial_convergence_last_success_timestamp_seconds',
+ 'NetworkPolicy'
+ )
await (watcher as any).runInitialNetworkPolicyConvergence()
@@ -4375,6 +4388,12 @@ describe('McpServerWatcher startup', () => {
result: 'deferred-unsynced',
})
).toBeGreaterThan(0)
+ expect(
+ await readInitialConvergenceMetric(
+ 'clerum_hcc_initial_convergence_last_success_timestamp_seconds',
+ 'NetworkPolicy'
+ )
+ ).toBe(successTimestampBefore)
;(watcher as any).mcpServerCacheSynced = true
await (watcher as any).runInitialNetworkPolicyConvergence()
@@ -4390,6 +4409,12 @@ describe('McpServerWatcher startup', () => {
})
)
expect((watcher as any).initialConvergenceRetryAttempts.has('NetworkPolicy')).toBe(false)
+ expect(
+ await readInitialConvergenceMetric(
+ 'clerum_hcc_initial_convergence_last_success_timestamp_seconds',
+ 'NetworkPolicy'
+ )
+ ).toBeGreaterThan(successTimestampBefore)
warnSpy.mockRestore()
await watcher.stop()
})
@@ -4400,12 +4425,22 @@ describe('McpServerWatcher startup', () => {
const watcher = new McpServerWatcher()
;(watcher as any).contextCacheSynced = true
;(watcher as any).mcpServerCacheSynced = false
+ const successTimestampBefore = await readInitialConvergenceMetric(
+ 'clerum_hcc_initial_convergence_last_success_timestamp_seconds',
+ 'NetworkPolicy'
+ )
await (watcher as any).runInitialNetworkPolicyConvergence()
expect(mocks.netPolFullReconcile).not.toHaveBeenCalled()
expect((watcher as any).initialConvergenceRetryAttempts.get('NetworkPolicy')).toBe(1)
expect((watcher as any).initialConvergenceRetryTimers.has('NetworkPolicy')).toBe(true)
+ expect(
+ await readInitialConvergenceMetric(
+ 'clerum_hcc_initial_convergence_last_success_timestamp_seconds',
+ 'NetworkPolicy'
+ )
+ ).toBe(successTimestampBefore)
;(watcher as any).mcpServerCacheSynced = true
await vi.advanceTimersByTimeAsync(5000)
@@ -4417,6 +4452,12 @@ describe('McpServerWatcher startup', () => {
result: 'certified',
})
).toBeGreaterThan(0)
+ expect(
+ await readInitialConvergenceMetric(
+ 'clerum_hcc_initial_convergence_last_success_timestamp_seconds',
+ 'NetworkPolicy'
+ )
+ ).toBeGreaterThan(successTimestampBefore)
warnSpy.mockRestore()
await watcher.stop()
})
@@ -4461,7 +4502,7 @@ describe('McpServerWatcher startup', () => {
;(watcher as any).contextCacheSynced = true
;(watcher as any).mcpServerCacheSynced = true
mocks.netPolFullReconcile.mockRejectedValueOnce(
- new Error('Desired NetworkPolicy inventory changed during authoritative revocation')
+ new Error(DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE)
)
const bumpBefore = await readLabeledConvergenceMetric(
'clerum_hcc_initial_convergence_pass_results_total',
diff --git a/host-context-controller/src/k8sClient.ts b/host-context-controller/src/k8sClient.ts
index 171c982a6..a1a8e5277 100644
--- a/host-context-controller/src/k8sClient.ts
+++ b/host-context-controller/src/k8sClient.ts
@@ -65,7 +65,11 @@ import {
initialConvergenceRetriesTotal,
initialConvergenceSwallowedTotal,
} from './metrics'
-import { NetworkPolicyReconciler, sameContextDesiredRevision } from './networkPolicyReconciler'
+import {
+ DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE,
+ NetworkPolicyReconciler,
+ sameContextDesiredRevision,
+} from './networkPolicyReconciler'
import type { ReadinessInventoryDetail } from './readinessGate'
import { McpServerReconciler } from './reconciler'
import { SharedFileSystemReconciler } from './sharedFileSystemReconciler'
@@ -229,9 +233,6 @@ type InitialConvergencePassResult =
| 'aborted-bump'
| 'failed'
-const DESIRED_INVENTORY_CHANGED_MESSAGE =
- 'Desired NetworkPolicy inventory changed during authoritative revocation'
-
function observeInitialNetworkPolicyPass(
startedAtMs: number,
result: InitialConvergencePassResult
@@ -3175,7 +3176,7 @@ export class McpServerWatcher implements McpServerProvider {
error
)
const abortedBump =
- error instanceof Error && error.message === DESIRED_INVENTORY_CHANGED_MESSAGE
+ error instanceof Error && error.message === DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE
observeInitialNetworkPolicyPass(startedAtMs, abortedBump ? 'aborted-bump' : 'failed')
this.scheduleInitialConvergenceRetry('NetworkPolicy')
}
diff --git a/host-context-controller/src/networkPolicyReconciler.test.ts b/host-context-controller/src/networkPolicyReconciler.test.ts
index 463bc546f..57a0e0f13 100644
--- a/host-context-controller/src/networkPolicyReconciler.test.ts
+++ b/host-context-controller/src/networkPolicyReconciler.test.ts
@@ -10,6 +10,7 @@ import {
networkPolicySafetyPassPoliciesTotal,
} from './metrics'
import {
+ DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE,
NetworkPolicyReconciler,
PUBLIC_EGRESS_EXCEPT_CIDRS,
sameContextDesiredRevision,
@@ -5559,7 +5560,7 @@ describe('NetworkPolicyReconciler', () => {
serverInventoryAuthoritative: () => true,
onAuthoritativeRevocationComplete,
})
- ).rejects.toThrow(/Desired NetworkPolicy inventory changed/)
+ ).rejects.toThrow(DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE)
expect(onAuthoritativeRevocationComplete).not.toHaveBeenCalled()
})
diff --git a/host-context-controller/src/networkPolicyReconciler.ts b/host-context-controller/src/networkPolicyReconciler.ts
index bf6832779..b34625f5d 100644
--- a/host-context-controller/src/networkPolicyReconciler.ts
+++ b/host-context-controller/src/networkPolicyReconciler.ts
@@ -68,6 +68,9 @@ type NetworkPolicyMutationOptions = {
honorsLostFence?: boolean
}
+export const DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE =
+ 'Desired NetworkPolicy inventory changed during authoritative revocation'
+
export function sameContextDesiredRevision(expected: ContextCRD, current: ContextCRD): boolean {
return (
expected.name === current.name &&
@@ -1576,7 +1579,7 @@ export class NetworkPolicyReconciler {
contextCleanupAuthoritative() &&
serverCleanupAuthoritative()
) {
- throw new Error('Desired NetworkPolicy inventory changed during authoritative revocation')
+ throw new Error(DESIRED_NETWORKPOLICY_INVENTORY_CHANGED_MESSAGE)
}
if (