github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #118761 from TommyStarK/gh_113831

Browse Source 
move common logic of highestSupportedVersion to util package
This commit is contained in:
Kubernetes Prow Robot
2023-09-18 13:59:25 -07:00
committed by GitHub
parent 76a22d3b32 42356bfbb3
commit f9f00da6bc
5 changed files with 158 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pkg/kubelet/cm/dra/plugin/plugin.go
View File

@@ -62,47 +62,6 @@ func (h *RegistrationHandler) RegisterPlugin(pluginName string, endpoint string,
return nil
}
// Return the highest supported version.
func highestSupportedVersion(versions []string) (*utilversion.Version, error) {
if len(versions) == 0 {
return nil, errors.New(log("DRA plugin reporting empty array for supported versions"))
}
var highestSupportedVersion *utilversion.Version
var theErr error
for i := len(versions) - 1; i >= 0; i-- {
currentHighestVer, err := utilversion.ParseGeneric(versions[i])
if err != nil {
theErr = err
continue
}
if currentHighestVer.Major() > 1 {
// DRA currently only has version 1.x
continue
}
if highestSupportedVersion == nil || highestSupportedVersion.LessThan(currentHighestVer) {
highestSupportedVersion = currentHighestVer
}
}
if highestSupportedVersion == nil {
return nil, fmt.Errorf(
"could not find a highest supported version from versions (%v) reported by this plugin: %+v",
versions, theErr)
}
if highestSupportedVersion.Major() != 1 {
return nil, fmt.Errorf("highest supported version reported by plugin is %v, must be v1.x", highestSupportedVersion)
}
return highestSupportedVersion, nil
}
func (h *RegistrationHandler) validateVersions(
callerName string,
pluginName string,
@@ -119,7 +78,7 @@ func (h *RegistrationHandler) validateVersions(
}
// Validate version
newPluginHighestVersion, err := highestSupportedVersion(versions)
newPluginHighestVersion, err := utilversion.HighestSupportedVersion(versions)
if err != nil {
return nil, errors.New(
log(