error handling e2e

Signed-off-by: Dmytro Rashko <dmitriy.rashko@amdocs.com>

Author: dimetron

Makefile

@@ -109,7 +109,9 @@ run: docker-build
 	@docker run --rm --net=host -p 8084:8084 -e OPENAI_API_KEY=$(OPENAI_API_KEY) -v $(HOME)/.kube:/home/nonroot/.kube -e KAGENT_TOOLS_PORT=8084 $(TOOLS_IMG) -- --kubeconfig /root/.kube/config
 
 PHONY: retag
-retag: docker-build
+retag: docker-build helm-version
+	@echo "Check Kind cluster $(KIND_CLUSTER_NAME) exists"
+	kind get clusters | grep -q $(KIND_CLUSTER_NAME) || kind create cluster --name $(KIND_CLUSTER_NAME)
 	@echo "Retagging tools image to $(RETAGGED_TOOLS_IMG)"
 	docker tag $(TOOLS_IMG) $(RETAGGED_TOOLS_IMG)
 	kind load docker-image --name $(KIND_CLUSTER_NAME) $(RETAGGED_TOOLS_IMG)
@@ -199,9 +201,7 @@ delete-kind-cluster:
 	kind delete cluster --name $(KIND_CLUSTER_NAME)
 
 .PHONY: kind-update-kagent
-kind-update-kagent: docker-build
-	kind get clusters | grep -q $(KIND_CLUSTER_NAME) || kind create cluster --name $(KIND_CLUSTER_NAME)
-	kind load docker-image --name $(KIND_CLUSTER_NAME) $(TOOLS_IMG)
+kind-update-kagent:  retag
 	kubectl patch --namespace kagent deployment/kagent --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/3/image", "value": "$(TOOLS_IMG)"}]'
 
 .PHONY: otel-local

e2e/k8s/e2e_helper.go

@@ -94,6 +94,9 @@ func (c *MCPClient) k8sListResources(resourceType string) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
+	if result.IsError {
+		return nil, fmt.Errorf("tool call failed: %s", result.Content)
+	}
 	return result, nil
 }
 
@@ -123,6 +126,9 @@ func (c *MCPClient) helmListReleases() (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
+	if result.IsError {
+		return nil, fmt.Errorf("tool call failed: %s", result.Content)
+	}
 	return result, nil
 }
 
@@ -151,7 +157,7 @@ func (c *MCPClient) istioInstall(profile string) (interface{}, error) {
 		return nil, err
 	}
 	if result.IsError {
-		return nil, fmt.Errorf("istio installation failed: %s", result.Content)
+		return nil, fmt.Errorf("tool call failed: %s", result.Content)
 	}
 	return result, nil
 }
@@ -182,6 +188,9 @@ func (c *MCPClient) argoRolloutsList(namespace string) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
+	if result.IsError {
+		return nil, fmt.Errorf("tool call failed: %s", result.Content)
+	}
 	return result, nil
 }
 

helm/kagent-tools/Chart-template.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: kagent
+name: kagent-tools
 description: A Helm chart for kagent-tools,
 type: application
 version: ${VERSION}

helm/kagent-tools/templates/clusterrole.yaml

@@ -77,6 +77,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - "admissionregistration.k8s.io"
+  resources:
+  - "mutatingwebhookconfigurations"
+  verbs:
+  - get
+  - list
+  - watch
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1
@@ -144,3 +152,12 @@ rules:
   - update
   - patch
   - delete
+- apiGroups:
+  - "admissionregistration.k8s.io"
+  resources:
+  - "mutatingwebhookconfigurations"
+  verbs:
+  - create
+  - update
+  - patch
+  - delete