openk8s 1.0.2 → 1.0.4

package/README.md

@@ -12,7 +12,7 @@ openk8s is a keyboard-driven TUI for browsing and managing Kubernetes clusters,
 
 | Tool | Required | Notes |
 |------|----------|-------|
-| [kubectl](https://kubernetes.io/docs/tasks/tools/) | yes | Must be configured with a valid kubeconfig |
+| [kubectl](https://kubernetes.io/docs/tasks/tools/) | yes | >= 1.36.1, must be configured with a valid kubeconfig |
 | [helm](https://helm.sh/) | no | Enables HelmRelease management |
 | [bun](https://bun.sh/) | yes | Required at runtime to execute the app |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openk8s",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "A terminal UI for Kubernetes",
   "license": "MIT",
   "type": "module",

package/src/app/__tests__/utils.test.ts

@@ -18,6 +18,8 @@ import {
   defaultNamespace,
   selectedRef,
   selectedForwardsForRef,
+  truncate,
+  formatClusterName,
 } from "../utils";
 import type { ResourceListItem, ActivePortForward, ResourceDetail, NamespaceItem, ResourceKind } from "../../lib/k8s/types";
 
@@ -333,6 +335,58 @@ describe("selectedRef", () => {
   });
 });
 
+// ── truncate ──────────────────────────────────────────────────────────────────
+
+describe("truncate", () => {
+  test("returns string as-is when within limit", () => {
+    expect(truncate("hello", 10)).toBe("hello");
+  });
+
+  test("truncates with ellipsis when over limit", () => {
+    expect(truncate("hello world", 5)).toBe("hell\u2026");
+  });
+
+  test("handles empty string", () => {
+    expect(truncate("", 5)).toBe("");
+  });
+
+  test("handles exact match", () => {
+    expect(truncate("hello", 5)).toBe("hello");
+  });
+
+  test("handles single-char limit", () => {
+    expect(truncate("ab", 1)).toBe("\u2026");
+  });
+});
+
+// ── formatClusterName ─────────────────────────────────────────────────────────
+
+describe("formatClusterName", () => {
+  test("formats EKS ARN", () => {
+    expect(formatClusterName("arn:aws:eks:us-east-1:123456789012:cluster/my-cluster", 30)).toBe("aws/eks/my-cluster");
+  });
+
+  test("truncates long EKS cluster name", () => {
+    expect(formatClusterName("arn:aws:eks:us-east-1:123456789012:cluster/this-name-is-way-too-long", 20)).toBe("aws/eks/this-name-i\u2026");
+  });
+
+  test("passes through non-ARN names", () => {
+    expect(formatClusterName("minikube", 30)).toBe("minikube");
+  });
+
+  test("truncates long non-ARN names", () => {
+    expect(formatClusterName("this-context-name-is-very-long", 15)).toBe("this-context-n\u2026");
+  });
+
+  test("handles empty string", () => {
+    expect(formatClusterName("", 10)).toBe("");
+  });
+
+  test("handles EKS name with hyphens and dots", () => {
+    expect(formatClusterName("arn:aws:eks:eu-west-2:123456789012:cluster/prod.blue-123", 30)).toBe("aws/eks/prod.blue-123");
+  });
+});
+
 // ── selectedForwardsForRef ──────────────────────────────────────────────────
 
 describe("selectedForwardsForRef", () => {

package/src/app/app-state.ts

@@ -94,7 +94,18 @@ export function reducer(state: AppState, action: AppAction): AppState {
         selectedKind: action.selectedKind,
       };
     case "setSelectedKind":
-      return { ...state, selectedKind: action.kind, resourceFilter: "", selectedResourceNames: [] };
+      return {
+        ...state,
+        selectedKind: action.kind,
+        resourceFilter: "",
+        selectedResourceNames: [],
+        resources: [],
+        resourcesStatus: "loading",
+        selectedResourceDetail: undefined,
+        selectedResourceDetailStatus: "idle",
+        events: [],
+        eventsStatus: "idle",
+      };
     case "setResourcesStatus":
       return { ...state, resourcesStatus: action.status };
     case "setResources":

package/src/app/app.tsx

@@ -22,11 +22,13 @@ import {
 import {
   currentKindLabel,
   filterResources,
+  formatClusterName,
   nextVisibleResourceName,
   resourcePreview,
   selectedForwardsForRef,
   selectedRef,
   statusLine,
+  truncate,
 } from "./utils";
 import { usePollingTick } from "./use-polling-tick";
 import { useFooterHints, useFooterHintRows } from "./use-footer-hints";
@@ -365,14 +367,18 @@ export function App() {
             padding: 1,
           }}
         >
-          <text fg={TEXT_PRIMARY}>
-            <span fg={KEY_HINT}>{GLYPHS.cluster}</span>
-            {` ${state.activeContext ?? "none"}`}
-          </text>
-          <text fg={TEXT_SUBTLE} attributes={TEXT_MUTED}>
-            <span fg={KEY_HINT}>{GLYPHS.ns}</span>
-            {` ${state.activeNamespace}`}
-          </text>
+          <box style={{ width: "100%" }}>
+            <text fg={TEXT_PRIMARY}>
+              <span fg={KEY_HINT}>{GLYPHS.cluster}</span>
+              {` ${formatClusterName(state.activeContext ?? "none", 26)}`}
+            </text>
+          </box>
+          <box style={{ width: "100%" }}>
+            <text fg={TEXT_SUBTLE} attributes={TEXT_MUTED}>
+              <span fg={KEY_HINT}>{GLYPHS.ns}</span>
+              {` ${truncate(state.activeNamespace, 26)}`}
+            </text>
+          </box>
           <KindRows
             resourceKinds={state.resourceKinds}
             selectedKind={state.selectedKind}

package/src/app/components/resource-rows.tsx

@@ -43,17 +43,16 @@ export function ResourceRows({
 
   return (
     <scrollbox ref={scrollRef} onMouseDown={onActivate} style={{ flexGrow: 1 }}>
-      {resources.length === 0 ? (
+      {status === "loading" ? (
+        <text fg={TEXT_SUBTLE} attributes={TextAttributes.DIM}>
+          {"\u27F3 Refreshing..."}
+        </text>
+      ) : resources.length === 0 ? (
         <text fg={TEXT_SUBTLE} attributes={TextAttributes.DIM}>
           {resourceEmptyState(status, filter)}
         </text>
       ) : (
       <box style={{ flexDirection: "column", width: "100%" }}>
-        {status === "loading" ? (
-          <text fg={TEXT_SUBTLE} attributes={TextAttributes.DIM}>
-            {"\u27F3 Refreshing..."}
-          </text>
-        ) : null}
         {resources.map((resource) => {
           const selected = resource.ref.name === selectedName;
           const marked = selectedNames.includes(resource.ref.name);

package/src/app/hooks/use-data-fetching.ts

@@ -166,8 +166,6 @@ export function useDataFetching(
     state.kubectlAvailable,
     clusterPollTick,
     manualRefreshNonce,
-    state.activeNamespace,
-    state.selectedKind,
   ]);
 
   // Load the resource list. Bug-fix: removed state.resources.length and state.selectedResourceName

package/src/app/utils.ts

@@ -260,6 +260,22 @@ export function selectedRef(options: SelectedRefOptions): ResourceRef | undefine
   return options.resource?.ref;
 }
 
+const EKS_ARN_RE = /^arn:aws:eks:[^:]+:\d{12}:cluster\/(.+)$/;
+
+export function truncate(s: string, maxLen: number): string {
+  if (s.length <= maxLen) return s;
+  return s.slice(0, maxLen - 1) + "\u2026";
+}
+
+export function formatClusterName(name: string, maxLen: number): string {
+  const match = name.match(EKS_ARN_RE);
+  if (match) {
+    const label = `aws/eks/${match[1]}`;
+    return truncate(label, maxLen);
+  }
+  return truncate(name, maxLen);
+}
+
 export function selectedForwardsForRef(options: SelectedForwardsForRefOptions): ActivePortForward[] {
   if (!options.ref) {
     return [];