Merge pull request #1509 from jumpserver/pr@dev@k8s_err

perf: K8s tree error

pkg/httpd/userwebsocket.go

@@ -237,13 +237,16 @@ func (userCon *UserWebsocket) readMessageLoop() error {
 			logger.Debugf("Ws[%s] receive %s message", userCon.Uuid, msg.Type)
 			continue
 		case TerminalK8STree:
-			data := userCon.k8sClient.GetTreeData()
+			data, err := userCon.k8sClient.GetTreeData()
 			responseMsg := Message{
 				Id:           userCon.Uuid,
 				Type:         TerminalK8STree,
 				Data:         data,
 				KubernetesId: msg.KubernetesId,
 			}
+			if err != nil {
+				responseMsg.Err = err.Error()
+			}
 
 			userCon.SendMessage(&responseMsg)
 			continue

pkg/proxy/k8s.go

@@ -121,36 +121,41 @@ var (
 	getPodContainersLine = "kubectl get pods --all-namespaces -o custom-columns=NAMESPACE:.metadata.namespace,POD:.metadata.name,CONTAINER:.spec.containers[*].name --no-headers"
 )
 
-func (kc *KubernetesClient) GetTreeData() string {
+func (kc *KubernetesClient) GetTreeData() (string, error) {
 	env := append(os.Environ(), "KUBECONFIG="+kc.configName)
 
 	namespacesCmd := exec.Command("bash", "-c", getNamespacesLine)
 	namespacesCmd.Env = env
 	namespacesOutput, err := namespacesCmd.CombinedOutput()
 	if err != nil {
 		logger.Debugf("Error executing kubectl get namespaces: %v", err)
-		return "{}"
+		return "{}", err
 	}
 
 	namespaceLines := strings.Split(strings.TrimSpace(string(namespacesOutput)), "\n")
 
+	namespaces := make(map[string]*Namespace)
+	for _, nsName := range namespaceLines {
+		if strings.HasPrefix(nsName, "error:") {
+			nsName = strings.TrimPrefix(nsName, "error: ")
+			return "{}", fmt.Errorf(nsName)
+		}
+
+		if nsName = strings.TrimSpace(nsName); nsName != "" {
+			namespaces[nsName] = &Namespace{Name: nsName, Type: "namespace"}
+		}
+	}
+
 	podsCmd := exec.Command("bash", "-c", getPodContainersLine)
 	podsCmd.Env = env
 	podsOutput, err := podsCmd.CombinedOutput()
 	if err != nil {
 		logger.Debugf("Error executing kubectl get pods: %v", err)
-		return "{}"
+		return "{}", err
 	}
 
 	podLines := strings.Split(strings.TrimSpace(string(podsOutput)), "\n")
 
-	namespaces := make(map[string]*Namespace)
-	for _, nsName := range namespaceLines {
-		if nsName = strings.TrimSpace(nsName); nsName != "" {
-			namespaces[nsName] = &Namespace{Name: nsName, Type: "namespace"}
-		}
-	}
-
 	for _, line := range podLines {
 		record := strings.Fields(line)
 		if len(record) < 3 {
@@ -189,10 +194,10 @@ func (kc *KubernetesClient) GetTreeData() string {
 	jsonData, err := json.Marshal(namespaces)
 	if err != nil {
 		logger.Errorf("Error marshalling JSON: %v", err)
-		return "{}"
+		return "{}", err
 	}
 
-	return string(jsonData)
+	return string(jsonData), nil
 }
 
 func (kc *KubernetesClient) Close() {