update few errors

Signed-off-by: Rohit Patil <[email protected]>

Author: ropatil010

pkg/promptsets/core/health_check.go

@@ -2,12 +2,32 @@ package core
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/containers/kubernetes-mcp-server/pkg/api"
-	internalk8s "github.com/containers/kubernetes-mcp-server/pkg/kubernetes"
 )
 
-func initHealthCheckPrompts(o internalk8s.Openshift) []api.ServerPrompt {
+const (
+	// Health check configuration constants
+	defaultRestartThreshold = 5
+	eventLookbackMinutes    = 30
+	maxWarningEvents        = 20
+)
+
+// isVerboseEnabled checks if the verbose flag is enabled.
+// It accepts "true", "1", "yes", or "y" (case-insensitive) as truthy values.
+func isVerboseEnabled(value string) bool {
+	switch strings.ToLower(value) {
+	case "true", "1", "yes", "y":
+		return true
+	default:
+		return false
+	}
+}
+
+// initHealthCheckPrompts creates prompts for cluster health diagnostics.
+// These prompts guide LLMs to systematically check cluster components using existing tools.
+func initHealthCheckPrompts() []api.ServerPrompt {
 	return []api.ServerPrompt{
 		{
 			Name:        "cluster_health_check",
@@ -25,7 +45,7 @@ func initHealthCheckPrompts(o internalk8s.Openshift) []api.ServerPrompt {
 				},
 			},
 			GetMessages: func(arguments map[string]string) []api.PromptMessage {
-				verbose := arguments["verbose"] == "true"
+				verbose := isVerboseEnabled(arguments["verbose"])
 				namespace := arguments["namespace"]
 
 				return buildHealthCheckPromptMessages(verbose, namespace)
@@ -34,13 +54,15 @@ func initHealthCheckPrompts(o internalk8s.Openshift) []api.ServerPrompt {
 	}
 }
 
+// buildHealthCheckPromptMessages constructs the prompt messages for cluster health checks.
+// It adapts the instructions based on verbose mode and namespace filtering.
 func buildHealthCheckPromptMessages(verbose bool, namespace string) []api.PromptMessage {
 	scopeMsg := "across all namespaces"
 	podListInstruction := "- Use pods_list to get all pods"
 
 	if namespace != "" {
 		scopeMsg = fmt.Sprintf("in namespace '%s'", namespace)
-		podListInstruction = fmt.Sprintf("- Use pods_list_in_namespace with namespace parameter set to '%s' to get all pods in namespace '%s'", namespace, namespace)
+		podListInstruction = fmt.Sprintf("- Use pods_list_in_namespace with namespace '%s'", namespace)
 	}
 
 	verboseMsg := ""
@@ -52,14 +74,17 @@ func buildHealthCheckPromptMessages(verbose bool, namespace string) []api.Prompt
 			"- Event messages and timestamps"
 	}
 
+	// Construct the event display range dynamically using maxWarningEvents
+	eventDisplayRange := fmt.Sprintf("10-%d", maxWarningEvents)
+
 	userMessage := fmt.Sprintf(`Please perform a comprehensive health check on the Kubernetes cluster %s.
 
 Follow these steps systematically:
 
 ## 1. Check Cluster-Level Components
 
 ### For OpenShift Clusters:
-- Use resources_list with kind=ClusterOperator to check cluster operator health
+- Use resources_list with apiVersion=config.openshift.io/v1 and kind=ClusterOperator to check cluster operator health
 - Look for operators with:
   * Degraded=True (CRITICAL)
   * Available=False (CRITICAL)
@@ -70,7 +95,7 @@ Follow these steps systematically:
 - Note the cluster type in your report
 
 ## 2. Check Node Health
-- Use resources_list with kind=Node to examine all nodes
+- Use resources_list with apiVersion=v1 and kind=Node to examine all nodes
 - Check each node for:
   * Ready condition != True (CRITICAL)
   * Unschedulable spec field = true (WARNING)
@@ -84,30 +109,30 @@ Follow these steps systematically:
   * Container state waiting with reason:
     - CrashLoopBackOff (CRITICAL)
     - ImagePullBackOff or ErrImagePull (CRITICAL)
-  * RestartCount > 5 (WARNING - configurable threshold)
+  * RestartCount > %d (WARNING - configurable threshold)
 - Group issues by type and count occurrences
 
 ## 4. Check Workload Controllers
 - Use resources_list for each workload type:
-  * kind=Deployment (apps/v1)
-  * kind=StatefulSet (apps/v1)
-  * kind=DaemonSet (apps/v1)
+  * apiVersion=apps/v1, kind=Deployment
+  * apiVersion=apps/v1, kind=StatefulSet
+  * apiVersion=apps/v1, kind=DaemonSet
 - For each controller, compare:
   * spec.replicas vs status.readyReplicas (Deployment/StatefulSet)
   * status.desiredNumberScheduled vs status.numberReady (DaemonSet)
   * Report mismatches as WARNINGs
 
 ## 5. Check Storage
-- Use resources_list with kind=PersistentVolumeClaim
+- Use resources_list with apiVersion=v1 and kind=PersistentVolumeClaim
 - Identify PVCs not in Bound phase (WARNING)
 - Note namespace and PVC name for each issue
 
 ## 6. Check Recent Events (Optional)
 - Use events_list to get cluster events
 - Filter for:
   * Type = Warning
-  * Timestamp within last 30 minutes
-- Limit to 10-20 most recent warnings
+  * Timestamp within last %d minutes
+- Limit to %s most recent warnings
 - Include event message and involved object%s
 
 ## Output Format
@@ -139,7 +164,7 @@ Scope: [all namespaces / specific namespace]
 [PVC status: total, bound, pending/other]
 
 ### Recent Events
-[Warning events from last 30 minutes]
+[Warning events from last %d minutes]
 
 ================================================
 Summary
@@ -162,7 +187,18 @@ Warnings: [count]
 - Be efficient: don't call the same tool multiple times unnecessarily
 - If a resource type doesn't exist (e.g., ClusterOperator on vanilla K8s), skip it gracefully
 - Provide clear, actionable insights in your summary
-- Use emojis for visual clarity: ✅ (healthy), ⚠️ (warning), ❌ (critical)`, scopeMsg, podListInstruction, verboseMsg)
+- Use emojis for visual clarity: ✅ (healthy), ⚠️ (warning), ❌ (critical)
+
+### Common apiVersion Values
+
+When using resources_list, specify the correct apiVersion for each resource type:
+- Core resources: apiVersion=v1 (Pod, Service, Node, PersistentVolumeClaim, ConfigMap, Secret, Namespace)
+- Apps: apiVersion=apps/v1 (Deployment, StatefulSet, DaemonSet, ReplicaSet)
+- Batch: apiVersion=batch/v1 (Job, CronJob)
+- RBAC: apiVersion=rbac.authorization.k8s.io/v1 (Role, RoleBinding, ClusterRole, ClusterRoleBinding)
+- Networking: apiVersion=networking.k8s.io/v1 (Ingress, NetworkPolicy)
+- OpenShift Config: apiVersion=config.openshift.io/v1 (ClusterOperator, ClusterVersion)
+- OpenShift Routes: apiVersion=route.openshift.io/v1 (Route)`, scopeMsg, podListInstruction, defaultRestartThreshold, eventLookbackMinutes, eventDisplayRange, verboseMsg, eventLookbackMinutes)
 
 	assistantMessage := `I'll perform a comprehensive cluster health check following the systematic approach outlined. Let me start by gathering information about the cluster components.`
 

pkg/promptsets/core/health_check_test.go

@@ -8,9 +8,39 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestIsVerboseEnabled(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected bool
+	}{
+		{"true lowercase", "true", true},
+		{"true capitalized", "True", true},
+		{"true uppercase", "TRUE", true},
+		{"numeric 1", "1", true},
+		{"yes lowercase", "yes", true},
+		{"yes capitalized", "Yes", true},
+		{"yes uppercase", "YES", true},
+		{"y lowercase", "y", true},
+		{"y uppercase", "Y", true},
+		{"false", "false", false},
+		{"0", "0", false},
+		{"no", "no", false},
+		{"empty string", "", false},
+		{"random string", "random", false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := isVerboseEnabled(tt.input)
+			assert.Equal(t, tt.expected, result, "isVerboseEnabled(%q) should return %v", tt.input, tt.expected)
+		})
+	}
+}
+
 func TestInitHealthCheckPrompts(t *testing.T) {
 	// When
-	prompts := initHealthCheckPrompts(nil)
+	prompts := initHealthCheckPrompts()
 
 	// Then
 	require.Len(t, prompts, 1)
@@ -58,7 +88,7 @@ func TestBuildHealthCheckPromptMessages(t *testing.T) {
 		userContent := messages[0].Content
 		assert.Contains(t, userContent, "in namespace 'test-namespace'")
 		assert.NotContains(t, userContent, "across all namespaces")
-		assert.Contains(t, userContent, "Use pods_list_in_namespace with namespace parameter set to 'test-namespace'")
+		assert.Contains(t, userContent, "Use pods_list_in_namespace with namespace 'test-namespace'")
 		assert.NotContains(t, userContent, "Use pods_list to get all pods")
 	})
 
@@ -156,24 +186,25 @@ func TestBuildHealthCheckPromptMessages(t *testing.T) {
 		}
 	})
 
-	t.Run("User message contains workload types", func(t *testing.T) {
+	t.Run("User message contains workload types with apiVersions", func(t *testing.T) {
 		// When
 		messages := buildHealthCheckPromptMessages(false, "")
 
 		// Then
 		userContent := messages[0].Content
 
-		workloadTypes := []string{
-			"kind=Deployment",
-			"kind=StatefulSet",
-			"kind=DaemonSet",
-			"kind=ClusterOperator",
-			"kind=Node",
-			"kind=PersistentVolumeClaim",
+		// Check for apiVersion + kind pairs
+		resourceSpecs := []string{
+			"apiVersion=apps/v1, kind=Deployment",
+			"apiVersion=apps/v1, kind=StatefulSet",
+			"apiVersion=apps/v1, kind=DaemonSet",
+			"apiVersion=config.openshift.io/v1 and kind=ClusterOperator",
+			"apiVersion=v1 and kind=Node",
+			"apiVersion=v1 and kind=PersistentVolumeClaim",
 		}
 
-		for _, wl := range workloadTypes {
-			assert.Contains(t, userContent, wl, "Missing workload type: %s", wl)
+		for _, spec := range resourceSpecs {
+			assert.Contains(t, userContent, spec, "Missing resource spec: %s", spec)
 		}
 	})
 
@@ -218,7 +249,7 @@ func TestBuildHealthCheckPromptMessages(t *testing.T) {
 
 func TestGetMessagesWithArguments(t *testing.T) {
 	// Given
-	prompts := initHealthCheckPrompts(nil)
+	prompts := initHealthCheckPrompts()
 	require.Len(t, prompts, 1)
 
 	getMessages := prompts[0].GetMessages
@@ -329,4 +360,12 @@ func TestHealthCheckPromptCompleteness(t *testing.T) {
 		}
 		assert.Greater(t, foundVerbs, 3, "Prompt should use clear imperative language")
 	})
+
+	t.Run("Includes apiVersion reference section", func(t *testing.T) {
+		assert.Contains(t, userContent, "Common apiVersion Values")
+		assert.Contains(t, userContent, "apiVersion=config.openshift.io/v1")
+		assert.Contains(t, userContent, "apiVersion=apps/v1")
+		assert.Contains(t, userContent, "apiVersion=v1")
+		assert.Contains(t, userContent, "ClusterOperator, ClusterVersion")
+	})
 }

pkg/promptsets/core/promptset.go

@@ -25,7 +25,7 @@ func (t *PromptSet) GetPrompts(o internalk8s.Openshift) []api.ServerPrompt {
 	prompts := make([]api.ServerPrompt, 0)
 
 	// Health check prompts
-	prompts = append(prompts, initHealthCheckPrompts(o)...)
+	prompts = append(prompts, initHealthCheckPrompts()...)
 
 	// Future: Add more prompts here
 	// prompts = append(prompts, initTroubleshootingPrompts(o)...)