feat: include server urls in configuration_contexts_list

Signed-off-by: Calum Murray <[email protected]>

Author: Cali0707

pkg/kubernetes/configuration.go

@@ -98,17 +98,22 @@ func (k *Kubernetes) ConfigurationContextsDefault() (string, error) {
 
 // ConfigurationContextsList returns the list of available context names
 // TODO: Should be moved to the Provider level ?
-func (k *Kubernetes) ConfigurationContextsList() ([]string, error) {
+func (k *Kubernetes) ConfigurationContextsList() (map[string]string, error) {
 	if k.manager.IsInCluster() {
-		return []string{inClusterKubeConfigDefaultContext}, nil
+		return map[string]string{inClusterKubeConfigDefaultContext: ""}, nil
 	}
 	cfg, err := k.manager.clientCmdConfig.RawConfig()
 	if err != nil {
 		return nil, err
 	}
-	contexts := make([]string, 0, len(cfg.Contexts))
-	for context := range cfg.Contexts {
-		contexts = append(contexts, context)
+	contexts := make(map[string]string, len(cfg.Contexts))
+	for name, context := range cfg.Contexts {
+		cluster, ok := cfg.Clusters[context.Cluster]
+		if !ok || cluster.Server == "" {
+			contexts[name] = "unknown"
+		} else {
+			contexts[name] = cluster.Server
+		}
 	}
 	return contexts, nil
 }

pkg/mcp/configuration_test.go

@@ -52,7 +52,7 @@ func (s *ConfigurationSuite) TestContextsList() {
 		})
 		s.Run("contains default context name", func() {
 			s.Regexpf(`^Available Kubernetes contexts \(\d+ total, default: fake-context\)`, toolResult.Content[0].(mcp.TextContent).Text, "invalid tool context default result content %v", toolResult.Content[0].(mcp.TextContent).Text)
-			s.Regexpf(`(?m)^\*fake-context$`, toolResult.Content[0].(mcp.TextContent).Text, "invalid tool context default result content %v", toolResult.Content[0].(mcp.TextContent).Text)
+			s.Regexpf(`(?m)^\*fake-context -> http:\/\/127\.0\.0\.1:\d*$`, toolResult.Content[0].(mcp.TextContent).Text, "invalid tool context default result content %v", toolResult.Content[0].(mcp.TextContent).Text)
 		})
 	})
 }

pkg/toolsets/config/configuration.go

@@ -15,7 +15,7 @@ func initConfiguration() []api.ServerTool {
 		{
 			Tool: api.Tool{
 				Name:        "configuration_contexts_list",
-				Description: "List all available context names from the kubeconfig file",
+				Description: "List all available context names and associated server urls from the kubeconfig file",
 				InputSchema: &jsonschema.Schema{
 					Type: "object",
 				},
@@ -78,16 +78,16 @@ func contextsList(params api.ToolHandlerParams) (*api.ToolCallResult, error) {
 	}
 
 	result := fmt.Sprintf("Available Kubernetes contexts (%d total, default: %s):\n\n", len(contexts), defaultContext)
-	result += "Format: [*] CONTEXT_NAME\n"
+	result += "Format: [*] CONTEXT_NAME -> SERVER_URL\n"
 	result += " (* indicates the default context used in tools if context is not set)\n\n"
 	result += "Contexts:\n---------\n"
-	for _, context := range contexts {
+	for context, server := range contexts {
 		marker := " "
 		if context == defaultContext {
 			marker = "*"
 		}
 
-		result += fmt.Sprintf("%s%s\n", marker, context)
+		result += fmt.Sprintf("%s%s -> %s\n", marker, context, server)
 	}
 	result += "---------\n\n"