feat: consolidate k8s service fetching

Author: CasLubbers

src/k8s-operations.test.ts

@@ -1,5 +1,5 @@
 import { CoreV1Api, V1Service } from '@kubernetes/client-node'
-import { getCloudttyActiveTime, getLogTime, groupK8sServices, toK8sService } from './k8s-operations'
+import { getCloudttyActiveTime, getLogTime, mergeCanaryServices, toK8sService } from './k8s-operations'
 
 // Mock the KubeConfig
 jest.mock('@kubernetes/client-node', () => {
@@ -30,9 +30,9 @@ describe('toK8sService', () => {
     expect(result).toEqual({ name: 'my-svc', ports: [8080], managedByKnative: false })
   })
 
-  test('uses app.kubernetes.io/name label as canonical name', () => {
-    const svc = makeService({ metadata: { name: 'my-svc-v1', labels: { 'app.kubernetes.io/name': 'my-svc' } } })
-    expect(toK8sService(svc)?.name).toBe('my-svc')
+  test('returns the raw service name', () => {
+    const svc = makeService({ metadata: { name: 'my-svc-v1', labels: {} } })
+    expect(toK8sService(svc)?.name).toBe('my-svc-v1')
   })
 
   test('filters out knative private services', () => {
@@ -60,40 +60,45 @@ describe('toK8sService', () => {
   })
 })
 
-describe('groupK8sServices', () => {
-  test('returns services unchanged when no duplicates', () => {
+describe('mergeCanaryServices', () => {
+  test('returns services unchanged when no canary variants present', () => {
     const services = [
       { name: 'svc-a', ports: [80], managedByKnative: false },
       { name: 'svc-b', ports: [8080], managedByKnative: false },
     ]
-    expect(groupK8sServices(services)).toEqual(services)
+    expect(mergeCanaryServices(services)).toEqual(services)
   })
 
-  test('merges canary variants with the same canonical name', () => {
+  test('groups -v1 and -v2 variants into a single entry with the base name', () => {
     const services = [
-      { name: 'my-svc', ports: [80], managedByKnative: false },
-      { name: 'my-svc', ports: [80], managedByKnative: false },
+      { name: 'my-svc-v1', ports: [80], managedByKnative: false },
+      { name: 'my-svc-v2', ports: [80], managedByKnative: false },
     ]
-    expect(groupK8sServices(services)).toEqual([{ name: 'my-svc', ports: [80], managedByKnative: false }])
+    expect(mergeCanaryServices(services)).toEqual([{ name: 'my-svc', ports: [80], managedByKnative: false }])
   })
 
-  test('deduplicates ports across merged services', () => {
+  test('does not strip suffix when only one variant exists', () => {
+    const services = [{ name: 'my-svc-v1', ports: [80], managedByKnative: false }]
+    expect(mergeCanaryServices(services)).toEqual([{ name: 'my-svc-v1', ports: [80], managedByKnative: false }])
+  })
+
+  test('deduplicates ports when merging canary variants', () => {
     const services = [
-      { name: 'my-svc', ports: [80, 443], managedByKnative: false },
-      { name: 'my-svc', ports: [443, 8080], managedByKnative: false },
+      { name: 'my-svc-v1', ports: [80, 443], managedByKnative: false },
+      { name: 'my-svc-v2', ports: [443, 8080], managedByKnative: false },
     ]
-    const result = groupK8sServices(services)
+    const result = mergeCanaryServices(services)
     expect(result).toHaveLength(1)
     expect(result[0].ports).toEqual(expect.arrayContaining([80, 443, 8080]))
     expect(result[0].ports).toHaveLength(3)
   })
 
-  test('propagates managedByKnative if any service in the group has it set', () => {
+  test('propagates managedByKnative if any variant in the group has it set', () => {
     const services = [
-      { name: 'my-svc', ports: [80], managedByKnative: false },
-      { name: 'my-svc', ports: [80], managedByKnative: true },
+      { name: 'my-svc-v1', ports: [80], managedByKnative: false },
+      { name: 'my-svc-v2', ports: [80], managedByKnative: true },
     ]
-    expect(groupK8sServices(services)[0].managedByKnative).toBe(true)
+    expect(mergeCanaryServices(services)[0].managedByKnative).toBe(true)
   })
 })
 

src/k8s-operations.ts

@@ -424,7 +424,6 @@ export async function getTeamSecretsFromK8s(namespace: string) {
 export function toK8sService(item: V1Service): K8sService | null {
   const knativeServiceTypeLabel = 'networking.internal.knative.dev/serviceType'
   const knativeServiceLabel = 'serving.knative.dev/service'
-  const appNameLabel = 'app.kubernetes.io/name'
 
   const labels = item.metadata?.labels ?? {}
 
@@ -441,28 +440,24 @@ export function toK8sService(item: V1Service): K8sService | null {
     managedByKnative = true
   }
 
-  // Group canary services (e.g. foo-v1 and foo-v2) by their common app.kubernetes.io/name label
-  const canonicalName = labels[appNameLabel] ?? name
   const ports = item.spec?.ports?.map((p) => p.port) ?? []
 
-  return { name: canonicalName, ports, managedByKnative }
+  return { name, ports, managedByKnative }
 }
 
-export function groupK8sServices(services: K8sService[]): K8sService[] {
-  const grouped = new Map<string, K8sService>()
-
-  for (const svc of services) {
-    const existing = grouped.get(svc.name)
-    if (existing) {
-      grouped.set(svc.name, {
-        ...existing,
-        ports: Array.from(new Set([...(existing.ports ?? []), ...(svc.ports ?? [])])),
-        managedByKnative: existing.managedByKnative || svc.managedByKnative,
-      })
-    } else {
-      grouped.set(svc.name, svc)
-    }
-  }
-
-  return Array.from(grouped.values())
+// Canary deployments produce two services: <name>-v1 and <name>-v2.
+// This function consolidates them into a single entry with the base name.
+// It works in two steps:
+//   1. Filter: drop -v2 when a matching -v1 exists (keeping only one representative)
+//   2. Map: rename the remaining -v1 to the base name when a matching -v2 exists
+// Services without a matching counterpart are left unchanged.
+export function mergeCanaryServices(services: K8sService[]): K8sService[] {
+  const nameSet = new Set(services.map((s) => s.name))
+
+  return services
+    .filter((svc) => !svc.name.endsWith('-v2') || !nameSet.has(svc.name.replace(/-v2$/, '-v1')))
+    .map((svc) => {
+      const baseName = svc.name.replace(/-v1$/, '')
+      return nameSet.has(`${baseName}-v2`) ? { ...svc, name: baseName } : svc
+    })
 }

src/otomi-stack.ts

@@ -121,7 +121,7 @@ import {
   getKubernetesVersion,
   getSecretValues,
   getTeamSecretsFromK8s,
-  groupK8sServices,
+  mergeCanaryServices,
   toK8sService,
   watchPodUntilRunning,
 } from './k8s-operations'
@@ -2196,7 +2196,7 @@ export default class OtomiStack {
     const { items } = await this.getApiClient().listNamespacedService({ namespace: `team-${teamId}` })
     const mapped = items.flatMap((item) => toK8sService(item) ?? [])
 
-    return groupK8sServices(mapped)
+    return mergeCanaryServices(mapped)
   }
 
   async getKubecfg(teamId: string): Promise<KubeConfig> {