fix(kubernetes): consolidate namespace label management and rename annotations to lfc/*

- Simplify ensureNamespaceExists labels in nativeBuild/utils.ts
- Rename lifecycle.io/* annotations to lfc/* in utils.ts and jobFactory.ts
- Update generateTTLLabels and generateTTLPatch to include lfc/uuid, lfc/type,
  and app.kubernetes.io/managed-by
- Consolidate createOrUpdateNamespace PATCH branches in kubernetes.ts
- Add UUID fallback derivation from namespace name in ttlCleanup.ts
- Update annotation assertions in buildkit.test.ts and utils.test.ts to match lfc/*

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: vigneshrajsb

src/server/lib/kubernetes.ts

@@ -82,7 +82,11 @@ async function generateTTLLabels({
   ttl: boolean;
   buildUUID: string;
 }): Promise<{ labels: Record<string, string>; logMessage: string }> {
-  const baseLabels = { 'lfc/uuid': uuid };
+  const baseLabels: Record<string, string> = {
+    'lfc/uuid': uuid,
+    'lfc/type': staticEnv ? 'static' : 'ephemeral',
+    'app.kubernetes.io/managed-by': 'lifecycle',
+  };
 
   // Static or TTL disabled - only set enable flag
   if (staticEnv || !ttl) {
@@ -117,16 +121,27 @@ async function generateTTLLabels({
  * Generates patch operations for updating TTL labels on existing namespace
  */
 async function generateTTLPatch({
+  uuid,
+  staticEnv,
   ttl,
   buildUUID,
 }: {
+  uuid: string;
+  staticEnv: boolean;
   ttl: boolean;
   buildUUID: string;
 }): Promise<{ patch: any[]; logMessage: string }> {
+  const basePatch = [
+    { op: 'add', path: '/metadata/labels/lfc~1uuid', value: uuid },
+    { op: 'add', path: '/metadata/labels/lfc~1type', value: staticEnv ? 'static' : 'ephemeral' },
+    { op: 'add', path: '/metadata/labels/app.kubernetes.io~1managed-by', value: 'lifecycle' },
+  ];
+
   // TTL disabled - only update enable flag
   if (!ttl) {
     return {
       patch: [
+        ...basePatch,
         {
           op: 'add',
           path: '/metadata/labels/lfc~1ttl-enable',
@@ -143,6 +158,7 @@ async function generateTTLPatch({
 
   return {
     patch: [
+      ...basePatch,
       {
         op: 'add',
         path: '/metadata/labels/lfc~1ttl-enable',
@@ -213,32 +229,18 @@ export async function createOrUpdateNamespace({
   };
 
   if (await namespaceExists(client, name)) {
-    // Only update TTL labels if not static env
-    if (!staticEnv) {
-      const { patch, logMessage: patchMessage } = await generateTTLPatch({
-        ttl,
-        buildUUID,
-      });
+    const { patch, logMessage: patchMessage } = await generateTTLPatch({
+      uuid,
+      staticEnv,
+      ttl: staticEnv ? false : ttl,
+      buildUUID,
+    });
 
-      await client.patchNamespace(name, patch, undefined, undefined, undefined, undefined, undefined, {
-        headers: { 'Content-Type': 'application/json-patch+json' },
-      });
-      getLogger({ namespace: name }).info(`Deploy: updated namespace ${patchMessage}`);
-      return;
-    } else {
-      await client.patchNamespace(
-        name,
-        [{ op: 'add', path: '/metadata/labels/lfc~1ttl-enable', value: 'false' }],
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        { headers: { 'Content-Type': 'application/json-patch+json' } }
-      );
-      getLogger({ namespace: name }).info('Deploy: patched namespace TTL disabled (static env)');
-      return;
-    }
+    await client.patchNamespace(name, patch, undefined, undefined, undefined, undefined, undefined, {
+      headers: { 'Content-Type': 'application/json-patch+json' },
+    });
+    getLogger({ namespace: name }).info(`Deploy: updated namespace ${patchMessage}`);
+    return;
   }
 
   try {

src/server/lib/kubernetes/jobFactory.ts

@@ -70,7 +70,7 @@ export function createKubernetesJob(config: JobConfig): V1Job {
         ...labels,
       },
       annotations: {
-        'lifecycle.io/triggered-at': new Date().toISOString(),
+        'lfc/triggered-at': new Date().toISOString(),
         ...annotations,
       },
     },
@@ -145,8 +145,8 @@ export function createBuildJob(config: BuildJobConfig): V1Job {
       'build-method': 'native',
     },
     annotations: {
-      'lifecycle.io/dockerfile': config.dockerfilePath,
-      'lifecycle.io/ecr-repo': config.ecrRepo,
+      'lfc/dockerfile': config.dockerfilePath,
+      'lfc/ecr-repo': config.ecrRepo,
     },
     podAnnotations: config.podAnnotations,
     initContainers: config.initContainers,

src/server/lib/nativeBuild/__tests__/buildkit.test.ts

@@ -246,8 +246,8 @@ describe('buildkitBuild', () => {
     expect(fullCommand).toContain('build-method: "native"');
 
     // Check annotations
-    expect(fullCommand).toContain('lifecycle.io/dockerfile: "Dockerfile"');
-    expect(fullCommand).toContain('lifecycle.io/ecr-repo: "test-repo"');
+    expect(fullCommand).toContain('lfc/dockerfile: "Dockerfile"');
+    expect(fullCommand).toContain('lfc/ecr-repo: "test-repo"');
   });
 });
 

src/server/lib/nativeBuild/__tests__/utils.test.ts

@@ -73,11 +73,9 @@ describe('nativeBuild/utils', () => {
       expect(manifest.metadata.labels['build-method']).toBe('native');
 
       // Check annotations
-      expect(manifest.metadata.annotations['lifecycle.io/dockerfile']).toBe('Dockerfile');
-      expect(manifest.metadata.annotations['lifecycle.io/ecr-repo']).toBe(
-        '123456789.dkr.ecr.us-east-1.amazonaws.com/test-repo'
-      );
-      expect(manifest.metadata.annotations['lifecycle.io/triggered-at']).toBeDefined();
+      expect(manifest.metadata.annotations['lfc/dockerfile']).toBe('Dockerfile');
+      expect(manifest.metadata.annotations['lfc/ecr-repo']).toBe('123456789.dkr.ecr.us-east-1.amazonaws.com/test-repo');
+      expect(manifest.metadata.annotations['lfc/triggered-at']).toBeDefined();
 
       // Check spec
       expect(manifest.spec.ttlSecondsAfterFinished).toBeUndefined(); // No TTL by default for non-static builds

src/server/lib/nativeBuild/utils.ts

@@ -39,7 +39,6 @@ export async function ensureNamespaceExists(namespace: string): Promise<void> {
           name: namespace,
           labels: {
             'app.kubernetes.io/managed-by': 'lifecycle',
-            'lifecycle.io/type': 'ephemeral',
           },
         },
       });
@@ -208,9 +207,9 @@ export function getBuildLabels(
 
 export function getBuildAnnotations(dockerfilePath: string, ecrRepo: string): Record<string, string> {
   return {
-    'lifecycle.io/dockerfile': dockerfilePath,
-    'lifecycle.io/ecr-repo': ecrRepo,
-    'lifecycle.io/triggered-at': new Date().toISOString(),
+    'lfc/dockerfile': dockerfilePath,
+    'lfc/ecr-repo': ecrRepo,
+    'lfc/triggered-at': new Date().toISOString(),
   };
 }
 

src/server/services/ttlCleanup.ts

@@ -187,10 +187,10 @@ export default class TTLCleanupService extends Service {
 
         const daysExpired = Math.floor((now - expireTime) / (1000 * 60 * 60 * 24));
 
-        const buildUUID = labels['lfc/uuid'];
+        let buildUUID = labels['lfc/uuid'];
         if (!buildUUID) {
-          getLogger().warn(`TTL: namespace missing uuid label namespace=${nsName}`);
-          continue;
+          buildUUID = nsName.replace('env-', '');
+          getLogger().warn(`TTL: namespace missing uuid label, derived from name namespace=${nsName}`);
         }
 
         updateLogContext({ buildUuid: buildUUID });