feat: abstract client URL configuration for CLI

devin-ai-integration[bot] · pyramation · devin-ai-integration[bot] · commit 8dacdc7cb4f1 · 2025-05-29T07:22:50.000Z
Co-Authored-By: Dan Lynch &lt;pyramation@gmail.com&gt;
diff --git a/packages/cli/src/commands.ts b/packages/cli/src/commands.ts
@@ -3,6 +3,7 @@ import { ParsedArgs } from 'minimist';
 
 import { readAndParsePackageJson } from './package';
 import { extractFirst, usageText } from './utils';
+import { getClientUrl } from './config';
 
 // Commands
 import deploy from './commands/deploy';
@@ -87,7 +88,10 @@ export const commands = async (argv: Partial<ParsedArgs>, prompter: Inquirerer,
     process.exit(1);
   }
 
-  await commandFn(newArgv, prompter, options);
+  const clientUrl = getClientUrl(newArgv);
+  const extendedOptions = { ...options, clientUrl };
+
+  await commandFn(newArgv, prompter, extendedOptions);
   prompter.close();
 
   return argv;
diff --git a/packages/cli/src/commands/apply.ts b/packages/cli/src/commands/apply.ts
@@ -106,7 +106,7 @@ export default async (
 ) => {
   try {
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
     
     const filePath = argv.f || argv._?.[0] || await promptYamlFilePath(prompter, argv);
diff --git a/packages/cli/src/commands/cluster-info.ts b/packages/cli/src/commands/cluster-info.ts
@@ -10,7 +10,7 @@ export default async (
 ) => {
   try {
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
 
     console.log(chalk.blue('Kubernetes cluster info:'));
diff --git a/packages/cli/src/commands/config.ts b/packages/cli/src/commands/config.ts
@@ -46,7 +46,7 @@ export default async (
 ) => {
   try {
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
     
     const subcommand = argv._?.[0];
diff --git a/packages/cli/src/commands/delete.ts b/packages/cli/src/commands/delete.ts
@@ -206,7 +206,7 @@ export default async (
 ) => {
   try {
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
 
     const namespace = argv.n || argv.namespace || getCurrentNamespace();
diff --git a/packages/cli/src/commands/deploy.ts b/packages/cli/src/commands/deploy.ts
@@ -196,7 +196,7 @@ export default async (
   try {
     // Initialize Kubernetes client
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
 
     // Create deployment
diff --git a/packages/cli/src/commands/describe.ts b/packages/cli/src/commands/describe.ts
@@ -202,7 +202,7 @@ export default async (
 ) => {
   try {
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
 
     const namespace = argv.n || argv.namespace || getCurrentNamespace();
diff --git a/packages/cli/src/commands/exec.ts b/packages/cli/src/commands/exec.ts
@@ -138,7 +138,7 @@ export default async (
 ) => {
   try {
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
 
     const namespace = argv.n || argv.namespace || getCurrentNamespace();
diff --git a/packages/cli/src/commands/get.ts b/packages/cli/src/commands/get.ts
@@ -127,7 +127,7 @@ export default async (
 ) => {
   try {
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
 
     const namespace = argv.n || argv.namespace || getCurrentNamespace();
diff --git a/packages/cli/src/commands/logs.ts b/packages/cli/src/commands/logs.ts
@@ -96,7 +96,7 @@ export default async (
 ) => {
   try {
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
 
     const namespace = argv.n || argv.namespace || getCurrentNamespace();
diff --git a/packages/cli/src/commands/port-forward.ts b/packages/cli/src/commands/port-forward.ts
@@ -141,7 +141,7 @@ export default async (
 ) => {
   try {
     const client = new KubernetesClient({
-      restEndpoint: 'http://localhost:8001' // Default kube-proxy endpoint
+      restEndpoint: (_options as any).clientUrl || 'http://127.0.0.1:8001'
     });
 
     const namespace = argv.n || argv.namespace || getCurrentNamespace();
diff --git a/packages/cli/src/config.ts b/packages/cli/src/config.ts
@@ -6,6 +6,7 @@ import * as yaml from 'js-yaml';
 const KUBECONFIG_PATH = join(homedir(), '.kubeconfig');
 
 const DEFAULT_NAMESPACE = 'default';
+const DEFAULT_CLIENT_URL = 'http://127.0.0.1:8001';
 
 interface KubeConfig {
   currentNamespace: string;
@@ -81,3 +82,12 @@ export function setCurrentNamespace(namespace: string): void {
     throw error;
   }
 }
+
+/**
+ * Get the Kubernetes client URL from CLI arguments or use default
+ * @param argv Command line arguments
+ * @returns The client URL to use
+ */
+export function getClientUrl(argv: any): string {
+  return argv.clientUrl || DEFAULT_CLIENT_URL;
+}
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -7,7 +7,8 @@ export const options: Partial<CLIOptions> = {
   minimistOpts: {
     alias: {
       v: 'version',
-      h: 'help'
+      h: 'help',
+      c: 'clientUrl'
     }
   }
 };
@@ -19,4 +20,4 @@ app.run().then(()=> {
 }).catch(error => {
   console.error(error);
   process.exit(1);
-});
+});
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
@@ -42,6 +42,10 @@ export const usageText = `
   Namespace:
     -n, --namespace        Specify the namespace to use. Default is from local config or "default".
   
+  Additional Options:
+    --clientUrl <url>      Specify the Kubernetes API endpoint URL.
+                           Default is http://127.0.0.1:8001 (kubectl proxy)
+  
   Additional Help:
     $ k8s help             Display this help information.
   `;
