fix generate node agent pod name (#309)

Signed-off-by: Zzde <zhangxh1997@gmail.com>

Author: zxh326

pkg/handlers/node_terminal_handler.go

@@ -92,13 +92,7 @@ func (h *NodeTerminalHandler) HandleNodeTerminalWebSocket(c *gin.Context) {
 }
 
 func (h *NodeTerminalHandler) createNodeAgent(ctx context.Context, cs *cluster.ClientSet, nodeName string) (string, error) {
-	truncateNodeName := nodeName
-	if len(nodeName)+len(common.NodeTerminalPodName)+5 > 63 {
-		maxLength := 63 - len(common.NodeTerminalPodName) - 5
-		truncateNodeName = nodeName[:maxLength]
-	}
-	podName := fmt.Sprintf("%s-%s-%s", common.NodeTerminalPodName, truncateNodeName, utils.RandomString(5))
-
+	podName := utils.GenerateNodeAgentName(nodeName)
 	// Define the kite node agent pod spec
 	pod := &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{

pkg/utils/pods.go

@@ -1,6 +1,9 @@
 package utils
 
 import (
+	"fmt"
+
+	"github.com/zxh326/kite/pkg/common"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -43,3 +46,12 @@ func IsPodErrorOrSuccess(pod *corev1.Pod) bool {
 	}
 	return false
 }
+
+func GenerateNodeAgentName(nodeName string) string {
+	truncateNodeName := nodeName
+	if len(nodeName)+len(common.NodeTerminalPodName)+7 > 63 {
+		maxLength := 63 - len(common.NodeTerminalPodName) - 7
+		truncateNodeName = nodeName[:maxLength]
+	}
+	return fmt.Sprintf("%s-%s-%s", common.NodeTerminalPodName, truncateNodeName, RandomString(5))
+}

pkg/utils/utils_test.go

@@ -28,3 +28,21 @@ func TestGetImageRegistryAndRepo(t *testing.T) {
 		}
 	}
 }
+
+func TestGenerateNodeAgentName(t *testing.T) {
+	testcase := []struct {
+		nodeName string
+	}{
+		{"node1"},
+		{"shortname"},
+		{"a-very-long-node-name-that-exceeds-the-maximum-length-allowed-for-kubernetes-names"},
+		{"node-with-63-characters-abcdefghijklmnopqrstuvwxyz-123456789101"},
+	}
+
+	for _, tc := range testcase {
+		podName := GenerateNodeAgentName(tc.nodeName)
+		if len(podName) > 63 {
+			t.Errorf("GenerateNodeAgentName(%q) = %q, length %d exceeds 63", tc.nodeName, podName, len(podName))
+		}
+	}
+}