@skyhook-io/k8s-ui 1.17.1 → 1.18.1

package/src/components/shared/DrainPlanDialog.tsx

@@ -19,6 +19,7 @@ export interface DrainPlanPod {
   pdb?: string
   pdbChecked: boolean
   terminating?: boolean
+  expectedSkip?: boolean
 }
 
 export interface DrainPlan {
@@ -95,7 +96,8 @@ const OUTCOME_LABEL: Record<DrainOutcome, string> = {
 
 const ESTIMATE_CAVEAT =
   'An estimate, not a guarantee: the drain re-lists live state when it runs, and pods, budgets and permissions can change until then. ' +
-  'Evictions a budget refuses are retried until the drain deadline (60 seconds, shared by all evictions); a pod covered by more than one budget is refused outright.'
+  'Drain normally waits up to 2 minutes for evictions and pod deletion, retrying when a disruption budget temporarily blocks eviction. ' +
+  'Older Radar versions may return before pods are deleted. A pod covered by more than one budget is refused outright.'
 
 interface DrainPlanContentProps {
   nodeName: string
@@ -217,7 +219,9 @@ export function DrainPlanContent({
                 {current.pods.map((p) => (
                   <tr key={`${p.namespace}/${p.name}`} className="border-b border-theme-border last:border-b-0 align-top">
                     <td className="px-2 py-1.5 whitespace-nowrap">
-                      <Badge severity={OUTCOME_SEVERITY[p.outcome]} size="sm">{OUTCOME_LABEL[p.outcome]}</Badge>
+                      <Badge severity={p.outcome === 'skip' && p.expectedSkip === false ? 'warning' : OUTCOME_SEVERITY[p.outcome]} size="sm">
+                        {p.outcome === 'skip' && p.expectedSkip !== undefined ? p.expectedSkip ? 'left by design' : 'requires attention' : OUTCOME_LABEL[p.outcome]}
+                      </Badge>
                     </td>
                     <td className="px-2 py-1.5 font-mono whitespace-nowrap text-theme-text-primary">
                       {p.namespace}/{p.name}

package/src/components/shared/ManagedByChip.test.tsx

@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest'
+import { renderToString } from 'react-dom/server'
+
+import { ManagedByChip } from './ManagedByChip'
+
+const owner = { tool: 'argocd' as const, kind: 'applications' as const, namespace: 'argocd', name: 'billing' }
+
+describe('ManagedByChip', () => {
+  it('says Managed by for a verified owner its status confirms', () => {
+    const html = renderToString(<ManagedByChip owner={owner} verified listing={{ state: 'confirmed' }} />)
+    expect(html).toContain('Managed by')
+  })
+
+  it('says Tracked by, with a warning, for an owner whose status does not list the resource while another does', () => {
+    const html = renderToString(
+      <ManagedByChip owner={owner} verified listing={{ state: 'conflict', listedBy: [{ tool: 'argocd', kind: 'applications', namespace: 'argocd', name: 'hub' }] }} />,
+    )
+    expect(html).toContain('Tracked by')
+    expect(html).not.toContain('Managed by')
+    expect(html).toMatch(/rounded-full[^"]*bg-amber/)
+  })
+})

package/src/components/shared/ManagedByChip.tsx

@@ -1,6 +1,6 @@
 import { GitBranch, Package } from 'lucide-react'
 import { clsx } from 'clsx'
-import type { GitOpsOwnerRef } from '../../utils/gitops-owner'
+import type { GitOpsOwnerRef, ManagerListing } from '../../utils/gitops-owner'
 import type { GitOpsStatus } from '../../types/gitops'
 import { StatusDot, type StatusTone } from '../ui/status-tone'
 import { Tooltip } from '../ui/Tooltip'
@@ -11,7 +11,10 @@ export type HelmOwnerRef = {
 }
 
 // ManagedByChip renders the "Managed by <ArgoCD/FluxCD app>" affordance for
-// resources detected (via labels/annotations) to be GitOps-managed. The chip
+// resources detected (via labels/annotations) to be GitOps-managed. `listing`
+// compares that claim with the managers whose status lists the resource: a
+// manager that doesn't list it while another does is shown as "Tracked by"
+// with a warning, since the claim is all that names it. The chip
 // is clickable when the host wires `onOpen`; integrators that don't surface
 // a GitOps tab can omit the handler and the chip degrades to a passive badge
 // so the relationship is still visible.
@@ -26,6 +29,7 @@ export function ManagedByChip({
   verified = true,
   pending = false,
   source,
+  listing,
   variant = 'inline',
 }: {
   owner: GitOpsOwnerRef
@@ -34,13 +38,15 @@ export function ManagedByChip({
   verified?: boolean
   pending?: boolean
   source?: string | null
+  listing?: ManagerListing
   variant?: 'inline' | 'block'
 }) {
   const toolLabel = owner.tool === 'argocd' ? 'ArgoCD' : 'FluxCD'
   const ownerKindLabel = gitOpsOwnerKindLabel(owner)
   const label = owner.namespace ? `${owner.namespace}/${owner.name}` : owner.name
   const statusLabel = status ? gitOpsStatusLabel(status) : null
-  const prefix = pending ? 'Resolving' : verified ? 'Managed by' : 'Tracked by'
+  const conflict = listing?.state === 'conflict' ? listing.listedBy : null
+  const prefix = pending ? 'Resolving' : verified && !conflict ? 'Managed by' : 'Tracked by'
   const tooltipContent = (
     <span className="flex flex-col gap-1">
       <span>
@@ -48,10 +54,23 @@ export function ManagedByChip({
           <>
             Looking up matching {ownerKindLabel} <TooltipCode>{label}</TooltipCode> in this cluster.
           </>
+        ) : conflict ? (
+          <>
+            This resource's {toolLabel} tracking metadata names <TooltipCode>{label}</TooltipCode>, but that {ownerKindLabel}'s status doesn't list it.{' '}
+            {conflict.length === 1 ? 'The status of ' : 'The statuses of '}
+            {conflict.map((m, i) => (
+              <span key={`${m.namespace}/${m.name}`}>
+                {i > 0 && ', '}
+                <TooltipCode>{m.namespace ? `${m.namespace}/${m.name}` : m.name}</TooltipCode>
+              </span>
+            ))}{' '}
+            {conflict.length === 1 ? 'does.' : 'do.'}
+          </>
         ) : verified ? (
           <>
             Managed by {toolLabel} · <TooltipCode>{label}</TooltipCode>
             {statusLabel && <> · {statusLabel}{status?.message ? `: ${status.message}` : ''}</>}
+            {listing?.state === 'confirmed' && <>. Its status lists this resource too.</>}
           </>
         ) : (
           <>
@@ -80,6 +99,7 @@ export function ManagedByChip({
         )}
       >
         <GitBranch className="h-3 w-3 shrink-0" />
+        {conflict && <StatusDot tone="degraded" size="xs" />}
         <span className="shrink-0 text-theme-text-tertiary">{prefix}</span>
         <span className="truncate max-w-[180px]">{label}</span>
         {statusLabel && (
@@ -141,7 +161,7 @@ export function HelmManagedByChip({
   )
 }
 
-function gitOpsOwnerKindLabel(owner: GitOpsOwnerRef): string {
+export function gitOpsOwnerKindLabel(owner: GitOpsOwnerRef): string {
   if (owner.tool === 'argocd') return 'Application'
   if (owner.kind === 'helmreleases') return 'HelmRelease'
   if (owner.kind === 'kustomizations') return 'Kustomization'

package/src/components/shared/ResourceActionsBar.identity.test.tsx

@@ -0,0 +1,64 @@
+import { describe, expect, it } from 'vitest'
+import { renderToString } from 'react-dom/server'
+import { ResourceActionsBar } from './ResourceActionsBar'
+
+const noop = () => {}
+
+function actions(kind: string, apiVersion: string) {
+  return renderToString(
+    <ResourceActionsBar
+      resource={{ kind, name: 'example', namespace: 'test' }}
+      data={{ apiVersion, metadata: { name: 'example', namespace: 'test' } }}
+      onFluxReconcile={noop}
+      onFluxSuspend={noop}
+      onFluxResume={noop}
+      onArgoSync={noop}
+      onArgoRefresh={noop}
+      onArgoSuspend={noop}
+      onArgoResume={noop}
+      canPortForward
+      renderPortForward={() => <button>Port forward</button>}
+    />,
+  )
+}
+
+describe('resource actions use the loaded API group', () => {
+  it.each(['app.k8s.io/v1beta1', 'notargoproj.io/v1alpha1', ''])('does not offer Argo actions for Application in %s', (apiVersion) => {
+    const html = actions('applications', apiVersion)
+    expect(html).not.toContain('>Sync<')
+    expect(html).not.toContain('>Refresh<')
+    expect(html).not.toContain('Enable Auto-Sync')
+  })
+
+  it('retains Argo actions for its exact Application group', () => {
+    const html = actions('applications', 'argoproj.io/v1alpha1')
+    expect(html).toContain('>Sync<')
+    expect(html).toContain('>Refresh<')
+    expect(html).toContain('Enable Auto-Sync')
+  })
+
+  it.each(['serving.knative.dev/v1', 'vendor.serving.knative.dev/v1', 'vendor.io/v1', ''])('does not port-forward a non-core Service in %s', (apiVersion) => {
+    expect(actions('services', apiVersion)).not.toContain('Port forward')
+  })
+
+  it('retains port forwarding for core Service', () => {
+    expect(actions('services', 'v1')).toContain('Port forward')
+  })
+  it.each([
+    ['gitrepositories', 'source.toolkit.fluxcd.io'],
+    ['ocirepositories', 'source.toolkit.fluxcd.io'],
+    ['helmrepositories', 'source.toolkit.fluxcd.io'],
+    ['kustomizations', 'kustomize.toolkit.fluxcd.io'],
+    ['helmreleases', 'helm.toolkit.fluxcd.io'],
+    ['alerts', 'notification.toolkit.fluxcd.io'],
+  ])('only offers Flux actions for %s in its exact group', (kind, group) => {
+    expect(actions(kind, `${group}/v1`)).toContain('>Reconcile<')
+    for (const apiVersion of ['', 'vendor.io/v1', `foreign.${group}/v1`, 'argoproj.io/v1alpha1']) {
+      const html = actions(kind, apiVersion)
+      expect(html).not.toContain('>Reconcile<')
+      expect(html).not.toContain('>Suspend<')
+      expect(html).not.toContain('>Resume<')
+    }
+  })
+
+})

package/src/components/shared/ResourceActionsBar.tsx

@@ -28,10 +28,13 @@ import { DialogPortal } from '../ui/DialogPortal'
 import type { SelectedResource, WorkloadRevision } from '../../types'
 import type { RadarUpgradeRequirement } from '../../types/fetch-error'
 import { displayKindName } from '../ui/drawer-components'
-import { getDefaultContainerName } from '../resources/resource-utils'
+import { getDefaultContainerName, getExecContainerNames } from '../resources/resource-utils'
 import { SetImageDialog, type SetImageOwnership } from './SetImageDialog'
 import { DrainPlanDialog, DEFAULT_DRAIN_DIALOG_OPTIONS, type DrainDialogOptions, type DrainPlan } from './DrainPlanDialog'
 import type { WorkloadImageInventory, WorkloadImageUpdate } from '../../types/core'
+import { getGitOpsTool } from '../gitops/detail-helpers'
+import { apiVersionToGroup } from '../../utils/navigation'
+import { isApiGroup } from '../resources/resource-utils-cnpg'
 import { isArgoRolloutResource } from '../../utils/workload-rollout'
 import { isCoreBatchJob } from '../../utils/api-resources'
 import { formatRelativeAgeTime } from '../../utils/format'
@@ -40,6 +43,8 @@ import { formatRelativeAgeTime } from '../../utils/format'
 // ACTIONS BAR - Interactive buttons that change based on resource kind
 // ============================================================================
 
+const FLUX_ACTION_KINDS = new Set(['gitrepositories', 'ocirepositories', 'helmrepositories', 'kustomizations', 'helmreleases', 'alerts'])
+
 interface ResourceActionsBarProps {
   resource: SelectedResource
   leadingActions?: React.ReactNode
@@ -187,6 +192,7 @@ export function ResourceActionsBar({
   onPlanDrain, onPlanDrainReset, drainPlan, isPlanningDrain, drainPlanError, drainPlanUpgrade,
 }: ResourceActionsBarProps) {
   const kind = resource.kind.toLowerCase()
+  const isFluxAction = FLUX_ACTION_KINDS.has(kind) && getGitOpsTool(kind, apiVersionToGroup(data?.apiVersion)) === 'flux'
   const coreBatchJob = isCoreBatchJob(kind, resource.group)
   const supportsWorkloadActions = ['deployments', 'statefulsets', 'daemonsets'].includes(kind) ||
     (kind === 'rollouts' && isArgoRolloutResource(data))
@@ -254,7 +260,7 @@ export function ResourceActionsBar({
         namespace: resource.namespace,
         podName: resource.name,
         containerName: getDefaultContainerName(data) || containers[0],
-        containers,
+        containers: getExecContainerNames(data),
       })
     }
   }
@@ -370,7 +376,7 @@ export function ResourceActionsBar({
                 onUncordonNode && (
                   <button
                     onClick={() => onUncordonNode({ name: resource.name })}
-                    disabled={isUncordoningNode}
+                    disabled={isUncordoningNode || isDrainingNode}
                     className="flex items-center gap-1.5 px-3 py-1.5 text-xs font-medium text-white bg-emerald-600 hover:bg-emerald-700 rounded-lg transition-colors disabled:opacity-50"
                   >
                     <Play className={`w-3.5 h-3.5 ${isUncordoningNode ? 'animate-pulse' : ''}`} />
@@ -406,7 +412,7 @@ export function ResourceActionsBar({
       )}
 
       {/* Service actions */}
-      {kind === 'services' && !data?.apiVersion?.includes('serving.knative.dev') && canPortForward && resource.namespace && resource.name && renderPortForward && (
+      {kind === 'services' && data?.apiVersion === 'v1' && canPortForward && resource.namespace && resource.name && renderPortForward && (
         renderPortForward({
           type: 'service',
           namespace: resource.namespace,
@@ -516,7 +522,7 @@ export function ResourceActionsBar({
       )}
 
       {/* FluxCD actions */}
-      {['gitrepositories', 'ocirepositories', 'helmrepositories', 'kustomizations', 'helmreleases', 'alerts'].includes(kind) && (
+      {isFluxAction && (
         <FluxActions
           resource={resource}
           data={data}
@@ -532,7 +538,7 @@ export function ResourceActionsBar({
       )}
 
       {/* ArgoCD actions */}
-      {kind === 'applications' && (
+      {kind === 'applications' && isApiGroup(data?.apiVersion, 'argoproj.io') && (
         <ArgoActions
           resource={resource}
           data={data}

package/src/components/shared/ResourceRendererDispatch.test.tsx

@@ -1087,3 +1087,52 @@ it('uses RayJob native detail only for the supported exact API', () => {
     if (apiVersion !== 'ray.io/v1') { expect(html).toContain('native-fallback'); expect(getResourceStatus('rayjobs', data)).toBeNull() }
   }
 })
+
+describe('API group identity', () => {
+  it.each([
+    ['applications', 'app.k8s.io/v1beta1', 'Application'],
+    ['applications', 'notargoproj.io/v1alpha1', 'Application'],
+    ['services', 'vendor.serving.knative.dev/v1', 'Service'],
+    ['ingresses', 'vendor.networking.internal.knative.dev/v1alpha1', 'Ingress'],
+    ['certificates', 'vendor.networking.internal.knative.dev/v1alpha1', 'Certificate'],
+    ['gateways', 'vendor.networking.istio.io/v1', 'Gateway'],
+  ])('keeps %s in %s generic', (plural, apiVersion, kind) => {
+    const data = { apiVersion, kind, metadata: { name: 'foreign', namespace: 'test' }, spec: { vendorSetting: 'custom-value' }, status: { phase: 'VendorReady' } }
+    expect(renderKind(plural, data, 'test')).toContain('custom-value')
+    expect(getResourceStatus(plural, data)?.text).toBe('VendorReady')
+  })
+
+  it('retains Argo CD status for its exact Application group', () => {
+    const data = { apiVersion: 'argoproj.io/v1alpha1', kind: 'Application', metadata: { name: 'real' }, status: { sync: { status: 'Synced' }, health: { status: 'Healthy' } } }
+    expect(renderKind('applications', data)).toContain('Synced')
+    expect(getResourceStatus('applications', data)?.text).toBe('Healthy')
+  })
+
+  it('retains Knative Service status and core Service presentation', () => {
+    expect(getResourceStatus('services', { apiVersion: 'serving.knative.dev/v1', status: { conditions: [{ type: 'Ready', status: 'True' }] } })?.text).toBe('Ready')
+    expect(renderKind('services', { apiVersion: 'v1', metadata: { name: 'core' }, spec: { type: 'ClusterIP', clusterIP: '10.0.0.1' } })).toContain('10.0.0.1')
+  })
+})
+
+describe('Flux kind collisions', () => {
+  it.each([
+    ['gitrepositories', 'source.toolkit.fluxcd.io'],
+    ['ocirepositories', 'source.toolkit.fluxcd.io'],
+    ['helmrepositories', 'source.toolkit.fluxcd.io'],
+    ['kustomizations', 'kustomize.toolkit.fluxcd.io'],
+    ['helmreleases', 'helm.toolkit.fluxcd.io'],
+    ['alerts', 'notification.toolkit.fluxcd.io'],
+  ])('keeps foreign %s generic and preserves its real Flux renderer', (kind, group) => {
+    const resource = {
+      apiVersion: `${group}/v1`, metadata: { name: 'example', namespace: 'test' },
+      spec: { vendorSetting: 'custom-value' }, status: { phase: 'VendorReady' },
+    }
+    expect(renderKind(kind, resource, 'test')).not.toContain('custom-value')
+    expect(getResourceStatus(kind, resource)?.text).not.toBe('VendorReady')
+    for (const apiVersion of ['vendor.io/v1', `foreign.${group}/v1`, 'argoproj.io/v1alpha1']) {
+      const foreign = { ...resource, apiVersion }
+      expect(renderKind(kind, foreign, 'test')).toContain('custom-value')
+      expect(getResourceStatus(kind, foreign)?.text).toBe('VendorReady')
+    }
+  })
+})

package/src/components/shared/ResourceRendererDispatch.tsx

@@ -1,3 +1,5 @@
+import { getGitOpsTool } from '../gitops/detail-helpers'
+import { apiVersionToGroup } from '../../utils/navigation'
 import { hasReflectorDetails } from '../resources/renderers/ReflectorSection'
 import { clsx } from 'clsx'
 import { SEVERITY_BADGE, HEALTH_BADGE_COLORS } from '../../utils/badge-colors'
@@ -314,6 +316,7 @@ import type { ScalerDiagnosis } from '../resources/renderers/WorkloadRenderer'
  * When an override is not provided, the base (shared) renderer is used.
  */
 export interface RendererOverrides {
+  FluxHelmReleaseRenderer?: React.ComponentType<React.ComponentProps<typeof FluxHelmReleaseRenderer>>
   JobRenderer?: React.ComponentType<{ data: any; onNavigate?: (ref: ResourceRef) => void }>
   JobSetRenderer?: React.ComponentType<{ data: any; onNavigate?: (ref: ResourceRef) => void }>
   RayJobRenderer?: React.ComponentType<{ data: any; onNavigate?: (ref: ResourceRef) => void }>
@@ -551,6 +554,8 @@ interface ResourceRendererDispatchProps {
   resource: SelectedResource
   data: any
   relationships?: Relationships
+  /** See RelatedResourcesSection. */
+  trackedBy?: string
   certificateInfo?: SecretCertificateInfo
   hpaDiagnosis?: HPADiagnosis
   scalerDiagnostics?: ScalerDiagnosis[]
@@ -597,6 +602,7 @@ export function ResourceRendererDispatch({
   resource,
   data,
   relationships,
+  trackedBy,
   certificateInfo,
   hpaDiagnosis,
   scalerDiagnostics,
@@ -700,8 +706,11 @@ export function ResourceRendererDispatch({
   // foreign CRD render a BLANK drawer rather than the generic one.
   // CAPI's `machines` and `machinesets` need the same protection because another
   // API group can publish either plural without inheriting CAPI presentation.
+  const isFluxKind = ['gitrepositories', 'ocirepositories', 'helmrepositories', 'kustomizations', 'helmreleases', 'alerts'].includes(kind)
+  const isFluxResource = getGitOpsTool(kind, apiVersionToGroup(data?.apiVersion)) === 'flux'
   const isGroupGatedKind =
-    kind === 'clusters' || kind === 'backups' || kind === 'scheduledbackups' || kind === 'poolers'
+    isFluxKind || kind === 'applications' || kind === 'services' || kind === 'ingresses' || kind === 'certificates' || kind === 'gateways'
+    || kind === 'clusters' || kind === 'backups' || kind === 'scheduledbackups' || kind === 'poolers'
     || kind === 'objectstores' || kind === 'databases' || kind === 'publications'
     || kind === 'subscriptions' || kind === 'imagecatalogs' || kind === 'clusterimagecatalogs' || kind === 'databaseroles' || kind === 'jobsets'
     || kind === 'policies' || kind === 'rollouts' || kind === 'experiments'
@@ -709,7 +718,13 @@ export function ResourceRendererDispatch({
     || kind === 'machines' || kind === 'machinesets' || kind === 'workloads' || kind === 'localqueues' || kind === 'clusterqueues'
   const isCNPGApiVersion = isApiGroup(data?.apiVersion, CNPG_GROUP)
   const groupGatedMatched =
-    (kind === 'clusters' && (isCNPGApiVersion || isApiGroup(data?.apiVersion, 'cluster.x-k8s.io')))
+    (isFluxKind && isFluxResource)
+    || (kind === 'applications' && isApiGroup(data?.apiVersion, 'argoproj.io'))
+    || (kind === 'services' && (data?.apiVersion === 'v1' || isApiGroup(data?.apiVersion, 'serving.knative.dev')))
+    || (kind === 'ingresses' && ['networking.k8s.io', 'extensions', 'networking.internal.knative.dev'].some(group => isApiGroup(data?.apiVersion, group)))
+    || (kind === 'certificates' && ['cert-manager.io', 'networking.internal.knative.dev'].some(group => isApiGroup(data?.apiVersion, group)))
+    || (kind === 'gateways' && ['gateway.networking.k8s.io', 'networking.istio.io'].some(group => isApiGroup(data?.apiVersion, group)))
+    || (kind === 'clusters' && (isCNPGApiVersion || isApiGroup(data?.apiVersion, 'cluster.x-k8s.io')))
     || (kind === 'backups' && (isCNPGApiVersion || isApiGroup(data?.apiVersion, 'velero.io')))
     || ((kind === 'scheduledbackups' || kind === 'poolers') && isCNPGApiVersion)
     || (kind === 'objectstores' && isApiGroup(data?.apiVersion, 'barmancloud.cnpg.io'))
@@ -755,6 +770,7 @@ export function ResourceRendererDispatch({
   const isKnownKind = KNOWN_KINDS.has(kind) || isCrossplaneMR || isCrossplaneClaim || isCrossplaneXR
 
   const JobComp = rendererOverrides?.JobRenderer ?? JobRenderer
+  const FluxHelmReleaseComp = rendererOverrides?.FluxHelmReleaseRenderer ?? FluxHelmReleaseRenderer
   const JobSetComp = rendererOverrides?.JobSetRenderer ?? JobSetRenderer
   const RayJobComp = rendererOverrides?.RayJobRenderer ?? RayJobRenderer
   const RayClusterComp = rendererOverrides?.RayClusterRenderer ?? RayClusterRenderer
@@ -797,7 +813,7 @@ export function ResourceRendererDispatch({
 
   const sidebarContent = showCommonSections && (
     <>
-      <RelatedResourcesSection relationships={sidebarRelationships} onNavigate={onNavigate} />
+      <RelatedResourcesSection relationships={sidebarRelationships} onNavigate={onNavigate} kind={kind} trackedBy={trackedBy} />
       {kind !== 'events' && <EventsSection fullscreen={!!renderSidebar} events={events || []} updates={updates || []} isLoading={eventsLoading ?? false} eventsError={eventsError ?? null} updatesError={updatesError ?? null} hint={eventsHint} />}
       <LabelsSection data={data} />
       <AnnotationsSection data={data} />
@@ -822,9 +838,9 @@ export function ResourceRendererDispatch({
           />
         )}
         {kind === 'replicasets' && <ReplicaSetRenderer data={data} />}
-        {kind === 'services' && !data?.apiVersion?.includes('serving.knative.dev') && <ServiceComp data={data} onCopy={onCopy} copied={copied} onNavigate={onNavigate} />}
+        {kind === 'services' && data?.apiVersion === 'v1' && <ServiceComp data={data} onCopy={onCopy} copied={copied} onNavigate={onNavigate} />}
         {kind === 'endpointslices' && <EndpointSliceRenderer data={data} onNavigate={onNavigate} />}
-        {kind === 'ingresses' && !data?.apiVersion?.includes('networking.internal.knative.dev') && <IngressRenderer data={data} onNavigate={onNavigate} />}
+        {kind === 'ingresses' && (isApiGroup(data?.apiVersion, 'networking.k8s.io') || isApiGroup(data?.apiVersion, 'extensions')) && <IngressRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'configmaps' && <ConfigMapRenderer data={data} relationships={relationships} onNavigate={onNavigate} />}
         {kind === 'secrets' && <SecretRenderer data={data} relationships={relationships} onNavigate={onNavigate} certificateInfo={certificateInfo} resourceData={data} onSaveSecretValue={onSaveSecretValue} isSaving={isSavingSecret} />}
         {kind === 'jobs' && !nonCoreJobFallthrough && <JobComp data={data} onNavigate={onNavigate} />}
@@ -846,7 +862,7 @@ export function ResourceRendererDispatch({
         {kind === 'analysisruns' && <AnalysisRunRenderer data={data} onNavigate={onNavigate} />}
         {(kind === 'analysistemplates' || kind === 'clusteranalysistemplates') && <AnalysisTemplateRenderer data={data} />}
         {kind === 'experiments' && isApiGroup(data?.apiVersion, 'argoproj.io') && <ExperimentRenderer data={data} onNavigate={onNavigate} />}
-        {kind === 'certificates' && !data?.apiVersion?.includes('networking.internal.knative.dev') && <CertificateRenderer data={data} />}
+        {kind === 'certificates' && isApiGroup(data?.apiVersion, 'cert-manager.io') && <CertificateRenderer data={data} />}
         {kind === 'workflows' && <WorkflowRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'persistentvolumes' && <PersistentVolumeRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'storageclasses' && <StorageClassRenderer data={data} />}
@@ -855,7 +871,7 @@ export function ResourceRendererDispatch({
         {kind === 'issuers' && <IssuerRenderer data={data} />}
         {kind === 'orders' && <OrderRenderer data={data} />}
         {kind === 'challenges' && <ChallengeRenderer data={data} />}
-        {kind === 'gateways' && (data.apiVersion?.includes('networking.istio.io') ? <IstioGatewayRenderer data={data} /> : <GatewayRenderer data={data} onNavigate={onNavigate} />)}
+        {kind === 'gateways' && groupGatedMatched && (isApiGroup(data.apiVersion, 'networking.istio.io') ? <IstioGatewayRenderer data={data} /> : <GatewayRenderer data={data} onNavigate={onNavigate} />)}
         {kind === 'gatewayclasses' && <GatewayClassRenderer data={data} />}
         {kind === 'httproutes' && <HTTPRouteRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'grpcroutes' && <GRPCRouteRenderer data={data} onNavigate={onNavigate} />}
@@ -875,13 +891,13 @@ export function ResourceRendererDispatch({
         {(kind === 'roles' || kind === 'clusterroles') && <RoleComp data={data} onNavigate={onNavigate} />}
         {(kind === 'rolebindings' || kind === 'clusterrolebindings') && <RoleBindingComp data={data} onNavigate={onNavigate} />}
         {kind === 'events' && <EventRenderer data={data} onNavigate={onNavigate} />}
-        {kind === 'gitrepositories' && <GitRepositoryRenderer data={data} />}
-        {kind === 'ocirepositories' && <OCIRepositoryRenderer data={data} />}
-        {kind === 'helmrepositories' && <HelmRepositoryRenderer data={data} />}
-        {kind === 'kustomizations' && <KustomizationRenderer data={data} onNavigate={onNavigate} />}
-        {kind === 'helmreleases' && <FluxHelmReleaseRenderer data={data} onNavigate={onNavigate} />}
-        {kind === 'alerts' && <AlertRenderer data={data} />}
-        {kind === 'applications' && <ArgoApplicationRenderer data={data} />}
+        {kind === 'gitrepositories' && isFluxResource && <GitRepositoryRenderer data={data} />}
+        {kind === 'ocirepositories' && isFluxResource && <OCIRepositoryRenderer data={data} />}
+        {kind === 'helmrepositories' && isFluxResource && <HelmRepositoryRenderer data={data} />}
+        {kind === 'kustomizations' && isFluxResource && <KustomizationRenderer data={data} onNavigate={onNavigate} />}
+        {kind === 'helmreleases' && isFluxResource && <FluxHelmReleaseComp data={data} onNavigate={onNavigate} />}
+        {kind === 'alerts' && isFluxResource && <AlertRenderer data={data} />}
+        {kind === 'applications' && isApiGroup(data?.apiVersion, 'argoproj.io') && <ArgoApplicationRenderer data={data} />}
         {kind === 'nodepools' && <KarpenterNodePoolComp data={data} onNavigate={onNavigate} />}
         {kind === 'nodeclaims' && <KarpenterNodeClaimRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'ec2nodeclasses' && <KarpenterEC2NodeClassRenderer data={data} />}
@@ -987,14 +1003,14 @@ export function ResourceRendererDispatch({
         {kind === 'leases' && <LeaseRenderer data={data} />}
         {kind === 'limitranges' && <LimitRangeRenderer data={data} />}
         {/* Knative Serving */}
-        {(kind === 'services' && data?.apiVersion?.includes('serving.knative.dev')) && <KnativeServiceRenderer data={data} onNavigate={onNavigate} />}
+        {(kind === 'services' && isApiGroup(data?.apiVersion, 'serving.knative.dev')) && <KnativeServiceRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'knativeservices' && <KnativeServiceRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'knativeconfigurations' && <KnativeConfigurationRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'knativerevisions' && <KnativeRevisionRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'knativeroutes' && <KnativeRouteRenderer data={data} onNavigate={onNavigate} />}
-        {(kind === 'ingresses' && data?.apiVersion?.includes('networking.internal.knative.dev')) && <KnativeIngressRenderer data={data} />}
+        {(kind === 'ingresses' && isApiGroup(data?.apiVersion, 'networking.internal.knative.dev')) && <KnativeIngressRenderer data={data} />}
         {kind === 'knativeingresses' && <KnativeIngressRenderer data={data} />}
-        {(kind === 'certificates' && data?.apiVersion?.includes('networking.internal.knative.dev')) && <KnativeCertificateRenderer data={data} />}
+        {(kind === 'certificates' && isApiGroup(data?.apiVersion, 'networking.internal.knative.dev')) && <KnativeCertificateRenderer data={data} />}
         {kind === 'knativecertificates' && <KnativeCertificateRenderer data={data} />}
         {kind === 'serverlessservices' && <ServerlessServiceRenderer data={data} onNavigate={onNavigate} />}
         {kind === 'domainmappings' && <DomainMappingRenderer data={data} onNavigate={onNavigate} />}
@@ -1099,11 +1115,11 @@ export function getResourceStatus(kind: string, data: any): { text: string; colo
   }
   if (k === 'replicasets') return getWorkloadStatus(data, k)
   if (k === 'services') {
-    if (data.apiVersion?.includes('serving.knative.dev')) {
+    if (isApiGroup(data.apiVersion, 'serving.knative.dev')) {
       const status = getKnativeConditionStatus(data)
       return { text: status.text, color: status.color }
     }
-    return getServiceStatus(data)
+    if (data.apiVersion === 'v1') return getServiceStatus(data)
   }
   if (k === 'endpointslices') {
     const endpoints = data.endpoints || []
@@ -1176,11 +1192,11 @@ export function getResourceStatus(kind: string, data: any): { text: string; colo
   if (k === 'workflows') return getWorkflowStatus(data)
   if (k === 'cronworkflows') return getCronWorkflowStatus(data)
   if (k === 'certificates') {
-    if (data.apiVersion?.includes('networking.internal.knative.dev')) {
+    if (isApiGroup(data.apiVersion, 'networking.internal.knative.dev')) {
       const status = getKnativeConditionStatus(data)
       return { text: status.text, color: status.color }
     }
-    return getCertificateStatus(data)
+    if (isApiGroup(data.apiVersion, 'cert-manager.io')) return getCertificateStatus(data)
   }
   if (k === 'persistentvolumes') return getPVStatus(data)
   if (k === 'certificaterequests') return getCertificateRequestStatus(data)
@@ -1189,20 +1205,21 @@ export function getResourceStatus(kind: string, data: any): { text: string; colo
   if (k === 'orders') return getOrderState(data)
   if (k === 'challenges') return getChallengeState(data)
   if (k === 'gateways') {
-    if (data.apiVersion?.includes('networking.istio.io')) return getIstioGatewayStatus(data)
-    return getGatewayStatus(data)
+    if (isApiGroup(data.apiVersion, 'networking.istio.io')) return getIstioGatewayStatus(data)
+    if (isApiGroup(data.apiVersion, 'gateway.networking.k8s.io')) return getGatewayStatus(data)
   }
   if (k === 'gatewayclasses') return getGatewayClassStatus(data)
   if (k === 'httproutes' || k === 'grpcroutes' || k === 'tcproutes' || k === 'tlsroutes' || k === 'udproutes') return getRouteStatus(data)
   if (k === 'sealedsecrets') return getSealedSecretStatus(data)
   if (k === 'poddisruptionbudgets') return getPDBStatus(data)
-  if (k === 'gitrepositories') return getGitRepositoryStatus(data)
-  if (k === 'ocirepositories') return getOCIRepositoryStatus(data)
-  if (k === 'helmrepositories') return getHelmRepositoryStatus(data)
-  if (k === 'kustomizations') return getKustomizationStatus(data)
-  if (k === 'helmreleases') return getFluxHelmReleaseStatus(data)
-  if (k === 'alerts') return getFluxAlertStatus(data)
-  if (k === 'applications') return getArgoApplicationStatus(data)
+  const isFluxResource = getGitOpsTool(k, apiVersionToGroup(data.apiVersion)) === 'flux'
+  if (k === 'gitrepositories' && isFluxResource) return getGitRepositoryStatus(data)
+  if (k === 'ocirepositories' && isFluxResource) return getOCIRepositoryStatus(data)
+  if (k === 'helmrepositories' && isFluxResource) return getHelmRepositoryStatus(data)
+  if (k === 'kustomizations' && isFluxResource) return getKustomizationStatus(data)
+  if (k === 'helmreleases' && isFluxResource) return getFluxHelmReleaseStatus(data)
+  if (k === 'alerts' && isFluxResource) return getFluxAlertStatus(data)
+  if (k === 'applications' && isApiGroup(data.apiVersion, 'argoproj.io')) return getArgoApplicationStatus(data)
   if (k === 'nodepools') return getNodePoolStatus(data)
   if (k === 'nodeclaims') return getNodeClaimStatus(data)
   if (k === 'ec2nodeclasses') return getEC2NodeClassStatus(data)
@@ -1347,7 +1364,7 @@ export function getResourceStatus(kind: string, data: any): { text: string; colo
   if (
     knativeConditionKinds.includes(k)
     || isKnativeSubscription
-    || (k === 'ingresses' && data.apiVersion?.includes('networking.internal.knative.dev'))
+    || (k === 'ingresses' && isApiGroup(data.apiVersion, 'networking.internal.knative.dev'))
   ) {
     const status = getKnativeConditionStatus(data)
     return { text: status.text, color: status.color }

package/src/components/timeline/DiffViewer.test.tsx

@@ -23,4 +23,73 @@ describe("DiffViewer", () => {
     expect(html).toContain("Old value:");
     expect(html).toContain("New value:");
   });
+
+  it("renders values kept out of the feed as a badge, not as struck-through text", () => {
+    const html = renderToStaticMarkup(
+      <DiffViewer
+        diff={{
+          summary: "pod template annotation checksum/config changed",
+          fields: [
+            { path: "spec.template.metadata.annotations[checksum/config]", oldValue: "(value hidden)", newValue: "(value hidden)" },
+            { path: "spec.template.metadata.annotations[example.com/new]", oldValue: null, newValue: "(set)" },
+            { path: "spec.template.metadata.annotations[example.com/old]", oldValue: "(set)", newValue: null },
+            { path: "spec.template.spec.affinity", oldValue: "changed", newValue: "changed" },
+          ],
+        }}
+      />,
+    );
+
+    expect(html).not.toContain("line-through");
+    expect(html).not.toContain("(value hidden)");
+    expect(html).not.toContain("(set)");
+    expect(html.match(/value hidden/g)).toHaveLength(4);
+    expect(html).toContain("Set");
+    expect(html).toContain("Removed");
+  });
+
+  it("names key changes instead of striking through an unchanged key list", () => {
+    const html = renderToStaticMarkup(
+      <DiffViewer
+        diff={{
+          summary: "data modified keys: [password]",
+          fields: [{ path: "data (modified keys)", oldValue: ["password"], newValue: ["password"] }],
+        }}
+      />,
+    );
+    expect(html).toContain("keys changed: <span class=\"font-mono\">password</span>");
+    expect(html).not.toContain("line-through");
+    expect(html).not.toContain("Old value:");
+  });
+
+  it("merges added, removed and modified key lists of one field into one row", () => {
+    const html = renderToStaticMarkup(
+      <DiffViewer
+        diff={{
+          summary: "",
+          fields: [
+            { path: "data (added keys)", oldValue: null, newValue: ["token"] },
+            { path: "data (removed keys)", oldValue: ["old"], newValue: null },
+            { path: "data (modified keys)", oldValue: ["a", "b"], newValue: ["a", "b"] },
+            { path: "stringData (added keys)", oldValue: null, newValue: ["extra"] },
+            { path: "type", oldValue: "Opaque", newValue: "kubernetes.io/tls" },
+          ],
+        }}
+      />,
+    );
+    expect(html.match(/>data</g)).toHaveLength(1);
+    expect(html).toMatch(/keys changed: <span[^>]*>a, b<\/span>.*added: <span[^>]*>token<\/span>.*removed: <span[^>]*>old<\/span>/);
+    expect(html).toContain(">stringData<");
+    expect(html).toContain("added: <span class=\"font-mono\">extra</span>");
+    // Ordinary fields keep the old→new rendering.
+    expect(html).toContain("Old value:");
+    expect(html).toContain("kubernetes.io/tls");
+  });
+
+  it("keeps the old→new rendering when a key-list path does not carry a list", () => {
+    const html = renderToStaticMarkup(
+      <DiffViewer diff={{ summary: "", fields: [{ path: "data (modified keys)", oldValue: "x", newValue: "y" }] }} />,
+    );
+    expect(html).toContain("Old value:");
+    expect(html).not.toContain("keys changed");
+  });
 });