@skyhook-io/k8s-ui 1.11.0 → 1.13.0

package/src/utils/resource-icons.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest'
-import { Database, Server, Puzzle } from 'lucide-react'
-import { getResourceIcon, DEFAULT_RESOURCE_ICON } from './resource-icons'
+import { Database, Network, Server, ShieldCheck, Puzzle } from 'lucide-react'
+import { getResourceIcon, getTopologyIcon, DEFAULT_RESOURCE_ICON } from './resource-icons'
 
 describe('getResourceIcon', () => {
   it('disambiguates colliding kinds by API group', () => {
@@ -14,6 +14,53 @@ describe('getResourceIcon', () => {
     // A third operator's `clusters` CRD must not inherit a Postgres icon.
     expect(getResourceIcon('Cluster', 'apps.kubeblocks.io')).toBe(DEFAULT_RESOURCE_ICON)
     expect(getResourceIcon('Backup', 'kubevirt.io')).toBe(DEFAULT_RESOURCE_ICON)
+    expect(getResourceIcon('HostEndpoint', 'networking.example.io')).toBe(DEFAULT_RESOURCE_ICON)
+    expect(getResourceIcon('IPPool', 'networking.example.io')).toBe(DEFAULT_RESOURCE_ICON)
+    expect(getResourceIcon('IPPool', 'extension.projectcalico.org')).toBe(DEFAULT_RESOURCE_ICON)
+    expect(getResourceIcon('Tier', 'extension.projectcalico.org')).toBe(DEFAULT_RESOURCE_ICON)
+  })
+
+  it('resolves Calico IPPool only for Calico API groups', () => {
+    expect(getResourceIcon('IPPool', 'crd.projectcalico.org')).toBe(Network)
+    expect(getResourceIcon('IPPool', 'projectcalico.org')).toBe(Network)
+    expect(getResourceIcon('IPPool')).toBe(DEFAULT_RESOURCE_ICON)
+  })
+
+  it('resolves Calico HostEndpoint only for Calico API groups', () => {
+    expect(getResourceIcon('HostEndpoint', 'crd.projectcalico.org')).toBe(Network)
+    expect(getResourceIcon('HostEndpoint', 'projectcalico.org')).toBe(Network)
+    expect(getResourceIcon('HostEndpoint')).toBe(DEFAULT_RESOURCE_ICON)
+  })
+
+  it('resolves Calico Tier only for Calico API groups', () => {
+    expect(getResourceIcon('Tier', 'crd.projectcalico.org')).toBe(Network)
+    expect(getResourceIcon('Tier', 'projectcalico.org')).toBe(Network)
+    expect(getResourceIcon('Tier')).toBe(DEFAULT_RESOURCE_ICON)
+  })
+
+  it('disambiguates NetworkPolicy and Calico policy kinds by API group', () => {
+    expect(getResourceIcon('NetworkPolicy', 'networking.k8s.io')).toBe(ShieldCheck)
+    expect(getResourceIcon('NetworkPolicy', 'projectcalico.org')).toBe(ShieldCheck)
+    expect(getResourceIcon('NetworkPolicy', 'crd.projectcalico.org')).toBe(ShieldCheck)
+    expect(getResourceIcon('NetworkPolicy', 'networking.example.io')).toBe(DEFAULT_RESOURCE_ICON)
+    expect(getResourceIcon('GlobalNetworkPolicy', 'projectcalico.org')).toBe(ShieldCheck)
+    expect(getResourceIcon('StagedNetworkPolicy', 'crd.projectcalico.org')).toBe(ShieldCheck)
+    expect(getResourceIcon('StagedGlobalNetworkPolicy', 'projectcalico.org')).toBe(ShieldCheck)
+    expect(getResourceIcon('StagedKubernetesNetworkPolicy', 'crd.projectcalico.org')).toBe(ShieldCheck)
+    expect(getResourceIcon('GlobalNetworkPolicy', 'networking.example.io')).toBe(DEFAULT_RESOURCE_ICON)
+  })
+
+  it('uses ShieldCheck for all Calico policy topology nodes', () => {
+    for (const kind of [
+      'CalicoNetworkPolicy',
+      'CalicoGlobalNetworkPolicy',
+      'CalicoStagedNetworkPolicy',
+      'CalicoStagedGlobalNetworkPolicy',
+      'CalicoStagedKubernetesNetworkPolicy',
+    ]) {
+      expect(getTopologyIcon(kind)).toBe(ShieldCheck)
+      expect(getResourceIcon(kind)).toBe(ShieldCheck)
+    }
   })
 
   it('ignores the group for kinds that do not collide', () => {

package/src/utils/resource-icons.ts

@@ -20,6 +20,7 @@ import {
   ShieldAlert,
   Radio,
   Globe,
+  Network,
 
   // Config
   FileSliders,
@@ -96,6 +97,11 @@ const KIND_ICON_MAP: Record<string, LucideIcon> = {
   service: Plug,
   ingress: DoorOpen,
   networkpolicy: ShieldCheck,
+  caliconetworkpolicy: ShieldCheck,
+  calicoglobalnetworkpolicy: ShieldCheck,
+  calicostagednetworkpolicy: ShieldCheck,
+  calicostagedglobalnetworkpolicy: ShieldCheck,
+  calicostagedkubernetesnetworkpolicy: ShieldCheck,
   ciliumnetworkpolicy: ShieldCheck,
   ciliumclusterwidenetworkpolicy: ShieldCheck,
   clusternetworkpolicy: ShieldCheck,
@@ -291,13 +297,33 @@ const GROUP_QUALIFIED_KIND_ICONS: Record<string, Record<string, LucideIcon>> = {
   backup: { 'postgresql.cnpg.io': DatabaseBackup },
   scheduledbackup: { 'postgresql.cnpg.io': DatabaseBackup },
   pooler: { 'postgresql.cnpg.io': Waypoints },
+  networkpolicy: {
+    'networking.k8s.io': ShieldCheck,
+    'crd.projectcalico.org': ShieldCheck,
+    'projectcalico.org': ShieldCheck,
+  },
+  hostendpoint: { 'crd.projectcalico.org': Network, 'projectcalico.org': Network },
+  ippool: { 'crd.projectcalico.org': Network, 'projectcalico.org': Network },
+  tier: { 'crd.projectcalico.org': Network, 'projectcalico.org': Network },
+  globalnetworkpolicy: { 'crd.projectcalico.org': ShieldCheck, 'projectcalico.org': ShieldCheck },
+  stagednetworkpolicy: { 'crd.projectcalico.org': ShieldCheck, 'projectcalico.org': ShieldCheck },
+  stagedglobalnetworkpolicy: { 'crd.projectcalico.org': ShieldCheck, 'projectcalico.org': ShieldCheck },
+  stagedkubernetesnetworkpolicy: { 'crd.projectcalico.org': ShieldCheck, 'projectcalico.org': ShieldCheck },
+}
+
+const TOPOLOGY_KIND_ICONS: Record<string, LucideIcon> = {
+  CalicoNetworkPolicy: ShieldCheck,
+  CalicoGlobalNetworkPolicy: ShieldCheck,
+  CalicoStagedNetworkPolicy: ShieldCheck,
+  CalicoStagedGlobalNetworkPolicy: ShieldCheck,
+  CalicoStagedKubernetesNetworkPolicy: ShieldCheck,
 }
 
 export function getResourceIcon(kind: string, group?: string): LucideIcon {
   const k = kind.toLowerCase()
   if (group) {
-    const byGroup = GROUP_QUALIFIED_KIND_ICONS[k]?.[group]
-    if (byGroup) return byGroup
+    const groupMap = GROUP_QUALIFIED_KIND_ICONS[k]
+    if (groupMap) return groupMap[group] ?? DEFAULT_RESOURCE_ICON
   }
   return KIND_ICON_MAP[k] ?? Puzzle
 }
@@ -306,6 +332,7 @@ export function getResourceIcon(kind: string, group?: string): LucideIcon {
 export function getTopologyIcon(kind: string): LucideIcon {
   if (kind === 'Internet') return Globe
   if (kind === 'PodGroup') return Boxes
+  if (TOPOLOGY_KIND_ICONS[kind]) return TOPOLOGY_KIND_ICONS[kind]
   return getResourceIcon(kind)
 }