fix(vllm): align GB10 images and upgrade version comparison (#14448)

This commit is contained in:
ssongliu
2026-11-16 13:39:50 +08:00
committed by GitHub
parent 5fbec27256
commit 1de2877d49
3 changed files with 7 additions and 13 deletions
+3 -1
View File
@@ -75,7 +75,9 @@ func isVllmUpgradeCandidate(currentVersion, targetVersion, currentImage string)
if !isVllmUpgradeVersionAllowed(currentVersion, targetVersion, currentImage) {
return false
}
if common.CompareVersion(trimVllmVersionFamily(targetVersion), trimVllmVersionFamily(currentVersion)) {
currentNumber, _, _ := strings.Cut(trimVllmVersionFamily(currentVersion), "-")
targetNumber, _, _ := strings.Cut(trimVllmVersionFamily(targetVersion), "-")
if common.CompareVersion(targetNumber, currentNumber) {
return true
}
return !hasVllmVersionFamilyPrefix(currentVersion) &&
+3 -1
View File
@@ -93,7 +93,9 @@ func isVllmUpgradeCandidate(currentVersion, targetVersion, currentImage string)
if !isVllmUpgradeVersionAllowed(currentVersion, targetVersion, currentImage) {
return false
}
if common.CompareVersion(trimVllmVersionFamily(targetVersion), trimVllmVersionFamily(currentVersion)) {
currentNumber, _, _ := strings.Cut(trimVllmVersionFamily(currentVersion), "-")
targetNumber, _, _ := strings.Cut(trimVllmVersionFamily(targetVersion), "-")
if common.CompareVersion(targetNumber, currentNumber) {
return true
}
return !hasVllmVersionFamilyPrefix(currentVersion) &&
+1 -11
View File
@@ -32,11 +32,6 @@ func GB10NodeCount(version string) int {
return 0
}
func IsGB10TileLangVersion(version string) bool {
tag := strings.TrimPrefix(strings.ToLower(strings.TrimSpace(version)), gb10VersionPrefix)
return strings.TrimPrefix(tag, "v") == "2026.11.15-optimized-for-4-gb10-ds-v4.1-flash"
}
func ResolveImage(image, imageType, tag string) string {
image = strings.TrimSpace(image)
tag = strings.TrimSpace(tag)
@@ -58,13 +53,8 @@ func ResolveImage(image, imageType, tag string) string {
switch suffix {
case "optimized-for-ds-v4-flash":
defaultImage = "1panel/vllm-gb10-dual-node:" + strings.TrimPrefix(tag, "v")
case "optimized-for-2-gb10-ds-v4-flash":
case "optimized-for-2-gb10-ds-v4-flash", "optimized-for-4-gb10-ds-v4.1-flash":
defaultImage = "1panel/vllm:" + strings.TrimPrefix(tag, "v")
case "optimized-for-4-gb10-ds-v4.1-flash":
defaultImage = "eugr/spark-vllm-b12x:latest"
if IsGB10TileLangVersion(tag) {
defaultImage = "spark-ds41f:1107"
}
case "optimized-for-ds-v4.1-flash":
defaultImage = "1panel/vllm:" + tag
}