add base name in node label

Author: lvjing2

cmd/module-controller/main.go

@@ -19,6 +19,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/koupleless/module_controller/common/zaplogger"
+	"github.com/koupleless/module_controller/report_server"
 	"github.com/koupleless/virtual-kubelet/vnode_controller"
 	"os"
 	"os/signal"
@@ -32,7 +33,6 @@ import (
 	"github.com/koupleless/module_controller/controller/module_deployment_controller"
 	"github.com/koupleless/module_controller/module_tunnels/koupleless_http_tunnel"
 	"github.com/koupleless/module_controller/module_tunnels/koupleless_mqtt_tunnel"
-	"github.com/koupleless/module_controller/report_server"
 	"github.com/koupleless/virtual-kubelet/common/tracker"
 	"github.com/koupleless/virtual-kubelet/common/utils"
 	vkModel "github.com/koupleless/virtual-kubelet/model"

common/model/model.go

@@ -16,6 +16,7 @@ type BaseMetadata struct {
 	Identity    string `json:"identity"`
 	Version     string `json:"version"`     // Version identifier
 	ClusterName string `json:"clusterName"` // ClusterName of the resource communicate with base
+	Name        string `json:"name"`        // Name of the base
 }
 
 // BaseStatus is the data of base heart beat.

common/utils/utils.go

@@ -82,6 +82,7 @@ func ConvertBaseStatusToNodeInfo(data model.BaseStatus, env string) vkModel.Node
 	return vkModel.NodeInfo{
 		Metadata: vkModel.NodeMetadata{
 			Name:        utils.FormatNodeName(data.BaseMetadata.Identity, env),
+			BaseName:    data.BaseMetadata.Name,
 			ClusterName: data.BaseMetadata.ClusterName,
 			Version:     data.BaseMetadata.Version,
 		},

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/go-resty/resty/v2 v2.11.0
 	github.com/google/uuid v1.6.0
 	github.com/koupleless/arkctl v0.2.3
-	github.com/koupleless/virtual-kubelet v0.3.5
+	github.com/koupleless/virtual-kubelet v0.3.6-0.20241219031131-baadab7cc6ab
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
 	github.com/sirupsen/logrus v1.9.3

go.sum

@@ -94,8 +94,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/koupleless/arkctl v0.2.3 h1:gjKvxvh2WT9dOGrFCWFFIAvnwN7uy1UtI7DA+npnJuY=
 github.com/koupleless/arkctl v0.2.3/go.mod h1:nbnAiPEv7x/ZDQ+QsjFWkqwxMDofGmqnFPHa3XpXHyE=
-github.com/koupleless/virtual-kubelet v0.3.5 h1:67BhE3zvJDys+6KOjMTBvs0T8AreUFD/Ekb1vssmIp0=
-github.com/koupleless/virtual-kubelet v0.3.5/go.mod h1:5fQ0uI9egbYDMxgUE0niS4agDTssIOCjq5wyO0ALNaU=
+github.com/koupleless/virtual-kubelet v0.3.6-0.20241219031131-baadab7cc6ab h1:DKR3MGxJh/NeKYdBwRhFplZ3WyufU1ZZpce4fVJs95Y=
+github.com/koupleless/virtual-kubelet v0.3.6-0.20241219031131-baadab7cc6ab/go.mod h1:5fQ0uI9egbYDMxgUE0niS4agDTssIOCjq5wyO0ALNaU=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=