Skip to content

add base name in node label #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lvjing2 merged 2 commits into from
Dec 19, 2024
Merged

add base name in node label #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15df6eb
add base name in node label
lvjing2 Dec 19, 2024
cfedb64
update vk
lvjing2 Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/module-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions common/model/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions common/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down Expand Up @@ -110,8 +111,7 @@ func ConvertHealthDataToNodeStatus(data ark.HealthData) vkModel.NodeStatusData {
}
resourceMap[corev1.ResourceMemory] = memory
return vkModel.NodeStatusData{
Resources: resourceMap,
CustomLabels: map[string]string{},
Resources: resourceMap,
}
}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.20241219063827-66baf533a4ab
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/sirupsen/logrus v1.9.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.20241219063827-66baf533a4ab h1:EkozcBGAFwB1H03he6jHJXSB2gAXMvv7+IXRC18LwsM=
github.com/koupleless/virtual-kubelet v0.3.6-0.20241219063827-66baf533a4ab/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=
Expand Down
Loading