From 23f012e05f41aad7a070cd7e570e4a8773218504 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:13:04 +0800 Subject: [PATCH 01/10] update Signed-off-by: james --- .github/workflows/dev.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 48d5d40..5d299c4 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -3,9 +3,7 @@ name: CI -on: - pull_request: - branches: [ "main" ] +on: [push, pull_request] env: GO_VERSION: "1.22.5" From ddc48fdbad3c64d9daed9a3a68e518a9c80ddca1 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:15:59 +0800 Subject: [PATCH 02/10] update hami commit Signed-off-by: james --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d81d606..86c9b48 100644 --- a/go.mod +++ b/go.mod @@ -57,6 +57,6 @@ require ( ) replace ( - github.com/Project-HAMi/HAMi v0.0.0 => github.com/Project-HAMi/HAMi v0.0.0-20250107033239-d04fc8baaad6 + github.com/Project-HAMi/HAMi v0.0.0 => github.com/Project-HAMi/HAMi v0.0.0-20250901013025-61c6cbe7d480 huawei.com/npu-exporter/v6 => gitee.com/ascend/ascend-npu-exporter/v6 v6.0.0-RC3 ) From d36fab85dd4aea264463d38987ba91c27e618e30 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:42:45 +0800 Subject: [PATCH 03/10] update Signed-off-by: james --- .github/workflows/dev.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 5d299c4..25fa095 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -17,6 +17,8 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} + - run: go mod tidy + - run: go mod verify - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: From e200a5634b63f5564e6e7b4408c262113ed897bb Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:44:53 +0800 Subject: [PATCH 04/10] update Signed-off-by: james --- .github/workflows/dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 25fa095..97e3be3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -6,7 +6,7 @@ name: CI on: [push, pull_request] env: - GO_VERSION: "1.22.5" + GO_VERSION: "1.24.6" jobs: golangci: @@ -22,7 +22,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.60 + version: latest build: env: From a5e8dc9353d28a73cd82a825146a5ec44a9e3cc2 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:47:47 +0800 Subject: [PATCH 05/10] update Signed-off-by: james --- internal/server/server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/server/server.go b/internal/server/server.go index e67ff2a..95c38a0 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -25,6 +25,7 @@ import ( "path" "time" + "github.com/Project-HAMi/HAMi/pkg/device" "github.com/Project-HAMi/HAMi/pkg/device/ascend" "github.com/Project-HAMi/HAMi/pkg/util" "github.com/Project-HAMi/HAMi/pkg/util/nodelock" @@ -190,7 +191,7 @@ func (ps *PluginServer) registerKubelet() error { func (ps *PluginServer) registerHAMi() error { devs := ps.mgr.GetDevices() - apiDevices := make([]*util.DeviceInfo, 0, len(devs)) + apiDevices := make([]*device.DeviceInfo, 0, len(devs)) // hami currently believes that the index starts from 0 and is continuous. for i, dev := range devs { apiDevices = append(apiDevices, &util.DeviceInfo{ @@ -205,7 +206,7 @@ func (ps *PluginServer) registerHAMi() error { }) } annos := make(map[string]string) - annos[ps.registerAnno] = util.MarshalNodeDevices(apiDevices) + annos[ps.registerAnno] = device.MarshalNodeDevices(apiDevices) annos[ps.handshakeAnno] = "Reported_" + time.Now().Add(time.Duration(*reportTimeOffset)*time.Second).Format("2006.01.02 15:04:05") node, err := util.GetNode(ps.nodeName) if err != nil { From 2d615c5822cd1796ae74c5752ac0cced7f46bf04 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:48:13 +0800 Subject: [PATCH 06/10] update Signed-off-by: james --- internal/server/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/server/server.go b/internal/server/server.go index 95c38a0..33489ca 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -194,7 +194,7 @@ func (ps *PluginServer) registerHAMi() error { apiDevices := make([]*device.DeviceInfo, 0, len(devs)) // hami currently believes that the index starts from 0 and is continuous. for i, dev := range devs { - apiDevices = append(apiDevices, &util.DeviceInfo{ + apiDevices = append(apiDevices, &device.DeviceInfo{ Index: uint(i), ID: dev.UUID, Count: int32(ps.mgr.VDeviceCount()), From 17c77d720e843fda4780081e0d5dc709b73f6d37 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:52:22 +0800 Subject: [PATCH 07/10] update Signed-off-by: james --- .golangci.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .golangci.yml diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..359c882 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,6 @@ +issues: + exclude-rules: + - path: internal/server/server\.go + linters: + - staticcheck + text: "SA1019:.*deprecated" From 196a24ffa8817e02683e4ac83618b7b14a6518fa Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:55:58 +0800 Subject: [PATCH 08/10] update Signed-off-by: james --- .github/workflows/dev.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 97e3be3..11f0928 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -17,8 +17,6 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - run: go mod tidy - - run: go mod verify - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: From b3fbd694b9bd27b53c09c0a34e44f9eb72f21668 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:57:18 +0800 Subject: [PATCH 09/10] update Signed-off-by: james --- .github/workflows/dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 11f0928..342cf98 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -17,6 +17,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} + - run: go mod tidy - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: From 2f004e015212460a041aa0aec79e9e96a924251f Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Sep 2025 14:58:40 +0800 Subject: [PATCH 10/10] update Signed-off-by: james --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 342cf98..f7eabee 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -6,7 +6,7 @@ name: CI on: [push, pull_request] env: - GO_VERSION: "1.24.6" + GO_VERSION: "1.22.5" jobs: golangci: