Merge pull request volcano-sh#40 from archlitchi/master

Fix ci error for devices
archlitchi · Apr 10, 2023 · 15b3915 · 15b3915
2 parents 63aa0d9 + 1d042c8
commit 15b3915
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmd/vgpu/main.go b/cmd/vgpu/main.go
@@ -25,9 +25,9 @@ import (
 	"github.com/spf13/viper"
 	"k8s.io/klog/v2"
 	pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
-	nvidiadevice "volcano.sh/k8s-device-plugin/pkg/plugin/vgpu4pd"
-	"volcano.sh/k8s-device-plugin/pkg/plugin/vgpu4pd/config"
-	"volcano.sh/k8s-device-plugin/pkg/plugin/vgpu4pd/util"
+	nvidiadevice "volcano.sh/k8s-device-plugin/pkg/plugin/vgpu"
+	"volcano.sh/k8s-device-plugin/pkg/plugin/vgpu/config"
+	"volcano.sh/k8s-device-plugin/pkg/plugin/vgpu/util"
 )
 
 var (

diff --git a/docker/amd64/Dockerfile.vgpu-ubuntu20.04 b/docker/amd64/Dockerfile.vgpu-ubuntu20.04
@@ -30,7 +30,7 @@ WORKDIR /go/src/volcano.sh/devices
 COPY . .
 
 RUN export CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' && \
-    go build -ldflags="-s -w" -o volcano-vgpu-device-plugin ./cmd/vgpu4pd
+    go build -ldflags="-s -w" -o volcano-vgpu-device-plugin ./cmd/vgpu
 
 FROM debian:stretch-slim
 

diff --git a/pkg/plugin/vgpu/util/types.go b/pkg/plugin/vgpu/util/types.go
@@ -47,7 +47,7 @@ const (
 	NodeNvidiaDeviceRegistered = "volcano.sh/node-vgpu-register"
 
 	// DeviceName used to indicate this device
-	VGPUDeviceName = "vgpu4pd"
+	VGPUDeviceName = "vgpu"
 )
 
 var (