Support world connection with ipv6

Signed-off-by: Yannik Messerli <[email protected]>

Author: yannikmesserli

src/domain/filtering/__tests__/filter-service.test.ts

@@ -48,6 +48,7 @@ const testFilterEntry = (
 describe('filterService', () => {
   const regular = ServiceCard.fromService(services.regular);
   const world = ServiceCard.fromService(services.world);
+  const worldIPv6 = ServiceCard.fromService(services.worldIPv6);
   const host = ServiceCard.fromService(services.host);
   const remoteNode = ServiceCard.fromService(services.remoteNode);
   const kubeDns = ServiceCard.fromService(services.kubeDNS);
@@ -61,11 +62,19 @@ describe('filterService', () => {
     expect(regular.workload).toBeTruthy();
 
     expect(world.isWorld).toBe(true);
+    expect(world.isWorldIPv6).toBe(false);
     expect(world.isHost).toBe(false);
     expect(world.isKubeDNS).toBe(false);
     expect(world.isPrometheusApp).toBe(false);
     expect(world.isRemoteNode).toBe(false);
 
+    expect(worldIPv6.isWorld).toBe(true);
+    expect(worldIPv6.isWorldIPv6).toBe(true);
+    expect(worldIPv6.isHost).toBe(false);
+    expect(worldIPv6.isKubeDNS).toBe(false);
+    expect(worldIPv6.isPrometheusApp).toBe(false);
+    expect(worldIPv6.isRemoteNode).toBe(false);
+
     expect(host.isWorld).toBe(false);
     expect(host.isHost).toBe(true);
     expect(host.isKubeDNS).toBe(false);

src/domain/labels.ts

@@ -22,6 +22,7 @@ export enum ReservedLabel {
   Host = 'reserved:host',
   KubeApiserver = 'reserved:kube-apiserver',
   World = 'reserved:world',
+  WorldIPv6 = 'reserved:world-ipv6',
   Health = 'reserved:health',
   Init = 'reserved:init',
   Ingress = 'reserved:ingress',
@@ -135,6 +136,17 @@ export class Labels {
     return null;
   }
 
+  public static findWorldInLabels(labels: KV[], normalizeLabels = true): string | null {
+    for (const lbl of labels) {
+      const kv = normalizeLabels ? Labels.normalizeLabel(lbl) : lbl;
+      if (kv.key === ReservedLabel.World || kv.key === ReservedLabel.WorldIPv6) {
+        return kv.key;
+      }
+    }
+
+    return null;
+  }
+
   public static containsKey(
     lbl: KV,
     nkeys: Set<string> | Iterable<string>,
@@ -314,10 +326,6 @@ export class Labels {
     return Labels.specialLabelKeys.has(key);
   }
 
-  public static isWorld(labels: KV[]): boolean {
-    return Labels.haveReserved(labels, ReservedLabel.World);
-  }
-
   public static isHost(labels: KV[]): boolean {
     return Labels.haveReserved(labels, ReservedLabel.Host);
   }
@@ -360,7 +368,10 @@ export class Labels {
     labels.forEach((lbl: KV) => {
       const kv = Labels.normalizeLabel(lbl);
 
-      props.isWorld = !!props.isWorld || Labels.isReserved(kv, ReservedLabel.World, false);
+      props.isWorld =
+        !!props.isWorld ||
+        Labels.isReserved(kv, ReservedLabel.World, false) ||
+        Labels.isReserved(kv, ReservedLabel.WorldIPv6, false);
       props.isKubeApiserver =
         !!props.isKubeApiserver || Labels.isReserved(kv, ReservedLabel.KubeApiserver, false);
       props.isHost = !!props.isHost || Labels.isReserved(kv, ReservedLabel.Host, false);

src/domain/service-map/card.ts

@@ -142,8 +142,8 @@ export class ServiceCard extends AbstractCard {
       result.push(FilterEntry.newLabel(ReservedLabel.Ingress));
     }
 
-    if (this.isWorld) {
-      result.push(FilterEntry.newLabel(ReservedLabel.World));
+    if (this.isWorld && this.worldLabel) {
+      result.push(FilterEntry.newLabel(this.worldLabel));
     }
 
     if (this.isKubeDNS) {
@@ -269,10 +269,19 @@ export class ServiceCard extends AbstractCard {
     return this.service.namespace || Labels.findNamespaceInLabels(this.labels);
   }
 
+  @computed
+  public get worldLabel(): string | null {
+    return Labels.findWorldInLabels(this.labels);
+  }
+
   public get isWorld(): boolean {
     return this.labelsProps.isWorld;
   }
 
+  public get isWorldIPv6(): boolean {
+    return this.labelsProps.isWorld && this.worldLabel === ReservedLabel.WorldIPv6;
+  }
+
   public get isHost(): boolean {
     return this.labelsProps.isHost;
   }

src/testing/data/services.ts

@@ -126,3 +126,14 @@ export const sameNamespace = {
     labels: replaceNsLabel(kubeDNS.labels),
   },
 };
+
+export const worldIPv6: HubbleService = {
+  id: 'world-ipv6-service',
+  name: 'world-ipv6-service',
+  namespace: 'world-ipv6-service-ns',
+  labels: [Labels.toKV(ReservedLabel.WorldIPv6)],
+  dnsNames: [],
+  workloads: [],
+  identity: MockServiceIdentity.World,
+  ...restOfService,
+};