Skip to content

Commit 7baca85

Browse files
committed
fix conflict
1 parent 67475e8 commit 7baca85

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

builder/deploy/cluster/cluster_manager.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,6 @@ func getXPULabel(labels map[string]string, config *config.Config) (string, strin
448448
//for nvidia gpu product label
449449
return "nvidia.com/gpu", "nvidia.com/gpu.product", "nvidia.com/gpu.mem"
450450
}
451-
if _, found := labels["nvidia.com/gpu.product"]; found {
452-
//for nvidia gpu product label
453-
return "nvidia.com/gpu", "nvidia.com/gpu.product"
454-
}
455451
if _, found := labels["kubemore_xpu_type"]; found {
456452
//for huawei gpu
457453
return "huawei.com/Ascend910", "kubemore_xpu_type", "kubemore_xpu_mem"

0 commit comments

Comments
 (0)