@skyhook-io/k8s-ui 1.8.5 → 1.8.6

package/src/components/resources/renderers/TraefikServiceRenderer.tsx

@@ -0,0 +1,118 @@
+import { Split, Copy } from 'lucide-react'
+import { Section, PropertyList, Property, AlertBanner, ResourceLink } from '../../ui/drawer-components'
+import { Badge } from '../../ui/Badge'
+import { getTraefikServiceType } from '../resource-utils-traefik'
+
+interface TraefikServiceRendererProps {
+  data: any
+  onNavigate?: (ref: { kind: string; namespace: string; name: string }) => void
+}
+
+function ServiceRow({ svc, ns, weightPct, onNavigate }: {
+  svc: any
+  ns: string
+  weightPct?: number
+  onNavigate?: (ref: { kind: string; namespace: string; name: string }) => void
+}) {
+  const isTraefik = svc.kind === 'TraefikService'
+  const port = svc.port ? `:${svc.port}` : ''
+  return (
+    <div className="flex items-center gap-2 text-xs">
+      {isTraefik && <Badge kind="TraefikService" size="sm">TraefikService</Badge>}
+      <ResourceLink
+        name={svc.name}
+        kind={isTraefik ? 'traefikservices' : 'services'}
+        namespace={svc.namespace || ns}
+        label={<span className="text-blue-400">{svc.name}{port}</span>}
+        onNavigate={onNavigate}
+      />
+      {weightPct !== undefined && (
+        <div className="flex items-center gap-1.5 ml-auto">
+          <div className="w-20 h-1.5 bg-theme-hover rounded-full overflow-hidden">
+            <div className="h-full bg-skyhook-500" style={{ width: `${Math.min(100, weightPct)}%` }} />
+          </div>
+          <span className="text-theme-text-tertiary tabular-nums w-10 text-right">{weightPct.toFixed(0)}%</span>
+        </div>
+      )}
+    </div>
+  )
+}
+
+export function TraefikServiceRenderer({ data, onNavigate }: TraefikServiceRendererProps) {
+  const spec = data.spec || {}
+  const ns = data.metadata?.namespace || ''
+  const type = getTraefikServiceType(data)
+
+  const weighted = spec.weighted?.services || []
+  const totalWeight = weighted.reduce((sum: number, s: any) => sum + (typeof s.weight === 'number' ? s.weight : 0), 0)
+  const mirroring = spec.mirroring
+  const hrw = spec.highestRandomWeight?.services || []
+
+  const noBackends = weighted.length === 0 && !mirroring && hrw.length === 0
+
+  return (
+    <>
+      {noBackends && (
+        <AlertBanner variant="warning" title="No backend services" message="This TraefikService defines no weighted, mirroring, or HRW backends." />
+      )}
+
+      <Section title="TraefikService" icon={Split} defaultExpanded>
+        <PropertyList>
+          <Property label="Type" value={type} />
+        </PropertyList>
+      </Section>
+
+      {weighted.length > 0 && (
+        <Section title={`Weighted Services (${weighted.length})`} defaultExpanded>
+          <div className="space-y-1.5">
+            {weighted.map((s: any, i: number) => (
+              <ServiceRow
+                key={i}
+                svc={s}
+                ns={ns}
+                weightPct={typeof s.weight === 'number' && totalWeight > 0 ? (s.weight / totalWeight) * 100 : undefined}
+                onNavigate={onNavigate}
+              />
+            ))}
+          </div>
+        </Section>
+      )}
+
+      {mirroring && (
+        <Section title="Mirroring" icon={Copy} defaultExpanded>
+          <div className="space-y-2">
+            <div>
+              <div className="text-[10px] font-medium text-theme-text-tertiary uppercase tracking-wider mb-1">Primary</div>
+              <ServiceRow svc={mirroring} ns={ns} onNavigate={onNavigate} />
+            </div>
+            {(mirroring.mirrors || []).length > 0 && (
+              <div>
+                <div className="text-[10px] font-medium text-theme-text-tertiary uppercase tracking-wider mb-1">Mirrors</div>
+                <div className="space-y-1">
+                  {mirroring.mirrors.map((m: any, i: number) => (
+                    <div key={i} className="flex items-center gap-2 text-xs">
+                      <ServiceRow svc={m} ns={ns} onNavigate={onNavigate} />
+                      {m.percent !== undefined && (
+                        <span className="text-theme-text-tertiary">{m.percent}%</span>
+                      )}
+                    </div>
+                  ))}
+                </div>
+              </div>
+            )}
+          </div>
+        </Section>
+      )}
+
+      {hrw.length > 0 && (
+        <Section title={`Highest Random Weight (${hrw.length})`} defaultExpanded>
+          <div className="space-y-1">
+            {hrw.map((s: any, i: number) => (
+              <ServiceRow key={i} svc={s} ns={ns} onNavigate={onNavigate} />
+            ))}
+          </div>
+        </Section>
+      )}
+    </>
+  )
+}

package/src/components/resources/renderers/TraefikTLSOptionRenderer.tsx

@@ -0,0 +1,62 @@
+import { Lock } from 'lucide-react'
+import { Section, PropertyList, Property } from '../../ui/drawer-components'
+import { Badge } from '../../ui/Badge'
+
+interface TraefikTLSOptionRendererProps {
+  data: any
+}
+
+export function TraefikTLSOptionRenderer({ data }: TraefikTLSOptionRendererProps) {
+  const spec = data.spec || {}
+  const ciphers: string[] = spec.cipherSuites || []
+  const curves: string[] = spec.curvePreferences || []
+  const alpn: string[] = spec.alpnProtocols || []
+  const clientAuth = spec.clientAuth
+
+  return (
+    <>
+      <Section title="TLS Option" icon={Lock} defaultExpanded>
+        <PropertyList>
+          <Property label="Min Version" value={spec.minVersion || 'default (VersionTLS12)'} />
+          {spec.maxVersion && <Property label="Max Version" value={spec.maxVersion} />}
+          {spec.sniStrict !== undefined && <Property label="SNI Strict" value={String(spec.sniStrict)} />}
+          {spec.preferServerCipherSuites !== undefined && (
+            <Property label="Prefer Server Ciphers" value={String(spec.preferServerCipherSuites)} />
+          )}
+          {alpn.length > 0 && <Property label="ALPN Protocols" value={alpn.join(', ')} />}
+        </PropertyList>
+      </Section>
+
+      {ciphers.length > 0 && (
+        <Section title={`Cipher Suites (${ciphers.length})`}>
+          <div className="flex flex-wrap gap-1">
+            {ciphers.map((c, i) => (
+              <Badge key={i} tone="structural" size="sm" className="font-mono">{c}</Badge>
+            ))}
+          </div>
+        </Section>
+      )}
+
+      {curves.length > 0 && (
+        <Section title={`Curve Preferences (${curves.length})`}>
+          <div className="flex flex-wrap gap-1">
+            {curves.map((c, i) => (
+              <Badge key={i} tone="structural" size="sm" className="font-mono">{c}</Badge>
+            ))}
+          </div>
+        </Section>
+      )}
+
+      {clientAuth && (
+        <Section title="Client Authentication" defaultExpanded>
+          <PropertyList>
+            {clientAuth.clientAuthType && <Property label="Type" value={clientAuth.clientAuthType} />}
+            {Array.isArray(clientAuth.secretNames) && clientAuth.secretNames.length > 0 && (
+              <Property label="CA Secrets" value={clientAuth.secretNames.join(', ')} />
+            )}
+          </PropertyList>
+        </Section>
+      )}
+    </>
+  )
+}

package/src/components/resources/renderers/WorkflowRenderer.tsx

@@ -48,7 +48,7 @@ function getPhaseBadgeClass(phase: string): string {
     case 'Succeeded':
       return 'status-healthy'
     case 'Running':
-      return 'status-degraded'
+      return 'status-neutral'
     case 'Failed':
     case 'Error':
       return 'status-unhealthy'

package/src/components/resources/renderers/badge-no-handrolled.test.tsx

@@ -0,0 +1,66 @@
+import { describe, it, expect } from 'vitest'
+import { readdirSync, readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+
+// Ratchet guard for the badge token system (see DESIGN.md "Badges").
+//
+// Hand-rolled chip color strings (`bg-<color>-N/NN text-<color>-N`) bypass the
+// theme and overload hues across intents. The migration to <Badge> is
+// incremental: this test pins the set of renderer files that STILL contain
+// hand-rolled chips. The set may SHRINK (clean a file → remove it here) but must
+// never GROW — a new renderer must use <Badge>/tokens, not literal colors.
+//
+// When this fails because you cleaned a file: delete it from BASELINE.
+// When it fails because you added a chip: use <Badge severity|kind|protocol|tone>
+// instead (DESIGN.md has the decision tree).
+
+const CHIP_RE =
+  /bg-(red|green|blue|yellow|orange|amber|purple|cyan|pink|indigo|emerald|teal|violet|rose|lime|sky)-[0-9]+\/[0-9]+ text-(red|green|blue|yellow|orange|amber|purple|cyan|pink|indigo|emerald|teal|violet|rose|lime|sky)-[0-9]+/
+
+// Renderer files that still contain hand-rolled chips, pending migration.
+// Ratchet: this list only shrinks. Do not add to it.
+const BASELINE = new Set<string>([
+  'AlertRenderer.tsx', 'ArgoApplicationRenderer.tsx', 'CertificateRenderer.tsx',
+  'CertificateRequestRenderer.tsx', 'ChallengeRenderer.tsx', 'CiliumNetworkPolicyRenderer.tsx',
+  'ClusterExternalSecretRenderer.tsx', 'ClusterIssuerRenderer.tsx', 'ClusterNetworkPolicyRenderer.tsx',
+  'cnpg-cells.tsx', 'CNPGClusterRenderer.tsx', 'EventRenderer.tsx', 'GatewayRenderer.tsx',
+  'GenericRenderer.tsx', 'IngressClassRenderer.tsx', 'IstioPeerAuthenticationRenderer.tsx',
+  'IstioServiceEntryRenderer.tsx', 'KarpenterNodeClaimRenderer.tsx', 'knative-cells.tsx',
+  'KnativeEventingRenderer.tsx', 'KnativeRevisionRenderer.tsx', 'kyverno-cells.tsx',
+  'KyvernoPolicyReportRenderer.tsx', 'NetworkPolicyRenderer.tsx', 'NodeRenderer.tsx',
+  'OrderRenderer.tsx', 'PodRenderer.tsx', 'RoleRenderer.tsx', 'RolloutRenderer.tsx',
+  'SealedSecretRenderer.tsx', 'SecretRenderer.tsx', 'SecretStoreRenderer.tsx',
+  'VeleroBackupRenderer.tsx', 'VeleroRestoreRenderer.tsx', 'VeleroScheduleRenderer.tsx',
+  'VPARenderer.tsx', 'VulnerabilityReportRenderer.tsx', 'WebhookConfigRenderer.tsx',
+])
+
+const dir = fileURLToPath(new URL('.', import.meta.url))
+
+function filesWithHandRolledChips(): string[] {
+  return readdirSync(dir)
+    .filter((f) => f.endsWith('.tsx') && !f.endsWith('.test.tsx'))
+    .filter((f) => CHIP_RE.test(readFileSync(`${dir}/${f}`, 'utf8')))
+    .sort()
+}
+
+describe('badge token system — no hand-rolled chip colors', () => {
+  const offenders = filesWithHandRolledChips()
+
+  it('does not introduce hand-rolled chips in new/migrated files (ratchet only shrinks)', () => {
+    const newOffenders = offenders.filter((f) => !BASELINE.has(f))
+    expect(
+      newOffenders,
+      `These renderers use hand-rolled chip colors. Use <Badge severity|kind|protocol|tone> ` +
+        `(see DESIGN.md "Badges"), not literal bg-/text- color strings:\n  ${newOffenders.join('\n  ')}`,
+    ).toEqual([])
+  })
+
+  it('baseline has no stale entries (remove files you have already cleaned)', () => {
+    const stale = [...BASELINE].filter((f) => !offenders.includes(f)).sort()
+    expect(
+      stale,
+      `These files are in BASELINE but no longer contain hand-rolled chips — ` +
+        `delete them from BASELINE in this test:\n  ${stale.join('\n  ')}`,
+    ).toEqual([])
+  })
+})

package/src/components/resources/renderers/contour-cells.tsx

@@ -2,6 +2,7 @@
 
 import { Shield } from 'lucide-react'
 import { Tooltip } from '../../ui/Tooltip'
+import { Badge, type BadgeSeverity } from '../../ui/Badge'
 import {
   getHTTPProxyFQDN,
   getHTTPProxyRouteCount,
@@ -36,11 +37,11 @@ export function HTTPProxyCell({ resource, column }: { resource: any; column: str
     }
     case 'status': {
       const { label } = getHTTPProxyStatus(resource)
-      const color = label === 'Valid' ? 'text-green-500'
-        : label === 'Invalid' ? 'text-red-500'
-        : label === 'Orphaned' ? 'text-yellow-500'
-        : 'text-theme-text-secondary'
-      return <span className={`text-sm ${color}`}>{label}</span>
+      const severity: BadgeSeverity = label === 'Valid' ? 'success'
+        : label === 'Invalid' ? 'error'
+        : label === 'Orphaned' ? 'warning'
+        : 'neutral'
+      return <Badge severity={severity}>{label}</Badge>
     }
     default:
       return <span className="text-sm text-theme-text-tertiary">-</span>

package/src/components/resources/renderers/index.ts

@@ -114,6 +114,10 @@ export * from './WorkflowRenderer'
 export * from './WorkflowTemplateRenderer'
 export * from './WorkloadRenderer'
 export * from './TraefikIngressRouteRenderer'
+export * from './TraefikMiddlewareRenderer'
+export * from './TraefikServiceRenderer'
+export * from './TraefikTLSOptionRenderer'
+export * from './TraefikServersTransportRenderer'
 export * from './traefik-cells'
 export * from './ContourHTTPProxyRenderer'
 export * from './contour-cells'

package/src/components/resources/renderers/istio-cells.tsx

@@ -1,7 +1,7 @@
 // Istio cell components for ResourcesView table
 
 import { clsx } from 'clsx'
-import { BADGE_INACTIVE } from '../../../utils/badge-colors'
+import { Badge, type BadgeSeverity } from '../../ui/Badge'
 import {
   getVirtualServiceStatus,
   getVirtualServiceHosts,
@@ -26,17 +26,17 @@ import {
   getAuthorizationPolicyRuleCount,
 } from '../resource-utils-istio'
 
-const modeColors: Record<string, string> = {
-  STRICT: 'bg-green-500/20 text-green-400',
-  PERMISSIVE: 'bg-yellow-500/20 text-yellow-400',
-  DISABLE: 'bg-red-500/20 text-red-400',
+const modeSeverity: Record<string, BadgeSeverity> = {
+  STRICT: 'success',
+  PERMISSIVE: 'warning',
+  DISABLE: 'error',
 }
 
-const actionColors: Record<string, string> = {
-  ALLOW: 'bg-green-500/20 text-green-400',
-  DENY: 'bg-red-500/20 text-red-400',
-  CUSTOM: 'bg-blue-500/20 text-blue-400',
-  AUDIT: 'bg-yellow-500/20 text-yellow-400',
+const actionSeverity: Record<string, BadgeSeverity> = {
+  ALLOW: 'success',
+  DENY: 'error',
+  CUSTOM: 'info',
+  AUDIT: 'warning',
 }
 
 export function VirtualServiceCell({ resource, column }: { resource: any; column: string }) {
@@ -133,12 +133,9 @@ export function ServiceEntryCell({ resource, column }: { resource: any; column:
     case 'location': {
       const location = getServiceEntryLocation(resource)
       return (
-        <span className={clsx(
-          'badge',
-          location === 'MESH_EXTERNAL' ? 'bg-orange-500/20 text-orange-400' : 'bg-blue-500/20 text-blue-400'
-        )}>
+        <Badge tone={location === 'MESH_EXTERNAL' ? 'accent2' : 'accent1'}>
           {location === 'MESH_EXTERNAL' ? 'External' : 'Internal'}
-        </span>
+        </Badge>
       )
     }
     case 'ports': {
@@ -163,12 +160,9 @@ export function PeerAuthenticationCell({ resource, column }: { resource: any; co
     case 'mode': {
       const mode = getPeerAuthenticationMode(resource)
       return (
-        <span className={clsx(
-          'badge',
-          modeColors[mode] || BADGE_INACTIVE
-        )}>
+        <Badge severity={modeSeverity[mode] ?? 'neutral'}>
           {mode}
-        </span>
+        </Badge>
       )
     }
     case 'selector': {
@@ -193,12 +187,9 @@ export function AuthorizationPolicyCell({ resource, column }: { resource: any; c
     case 'action': {
       const action = getAuthorizationPolicyAction(resource)
       return (
-        <span className={clsx(
-          'badge',
-          actionColors[action] || BADGE_INACTIVE
-        )}>
+        <Badge severity={actionSeverity[action] ?? 'neutral'}>
           {action}
-        </span>
+        </Badge>
       )
     }
     case 'rules': {

package/src/components/resources/resource-utils-cnpg.ts

@@ -283,7 +283,7 @@ export function getCNPGScheduledBackupStatus(resource: any): StatusBadge {
   const isSuspended = resource.spec?.suspend === true
 
   if (isSuspended) {
-    return { text: 'Suspended', color: healthColors.degraded, level: 'degraded' }
+    return { text: 'Suspended', color: healthColors.neutral, level: 'neutral' }
   }
 
   // If we have a last schedule time, it's active

package/src/components/resources/resource-utils-keda.ts

@@ -50,7 +50,9 @@ export function getScaledObjectStatus(resource: any): StatusBadge {
     return { text: 'Active', color: healthColors.healthy, level: 'healthy' }
   }
   if (activeCond?.status === 'False') {
-    return { text: 'Idle', color: healthColors.degraded, level: 'degraded' }
+    // Idle is the normal resting state of a scaler with no triggers firing
+    // (like a CronJob waiting for its next run), not a fault.
+    return { text: 'Idle', color: healthColors.neutral, level: 'neutral' }
   }
 
   if (readyCond?.status === 'True') {
@@ -129,17 +131,21 @@ export function getScaledJobStatus(resource: any): StatusBadge {
   if (readyCond?.status === 'True') {
     return { text: 'Ready', color: healthColors.healthy, level: 'healthy' }
   }
+  // A non-operational scaler (Ready=False) is unhealthy and must take precedence
+  // over the Idle (Active=False) branch below — otherwise a broken-and-idle
+  // ScaledJob hides as benign "Idle". Mirrors getScaledObjectStatus.
+  if (readyCond?.status === 'False') {
+    return { text: readyCond.reason || 'NotReady', color: healthColors.unhealthy, level: 'unhealthy' }
+  }
 
   const activeCond = conditions.find((c: any) => c.type === 'Active')
   if (activeCond?.status === 'True') {
     return { text: 'Active', color: healthColors.healthy, level: 'healthy' }
   }
   if (activeCond?.status === 'False') {
-    return { text: 'Idle', color: healthColors.degraded, level: 'degraded' }
-  }
-
-  if (readyCond?.status === 'False') {
-    return { text: readyCond.reason || 'NotReady', color: healthColors.unhealthy, level: 'unhealthy' }
+    // Idle is the normal resting state of a scaler with no triggers firing
+    // (like a CronJob waiting for its next run), not a fault.
+    return { text: 'Idle', color: healthColors.neutral, level: 'neutral' }
   }
 
   return { text: 'Unknown', color: healthColors.unknown, level: 'unknown' }