Return available ske versions in the error message (#278)
This commit is contained in:
parent
32d176ee86
commit
d1ceb77081
1 changed files with 3 additions and 1 deletions
|
|
@ -1337,11 +1337,13 @@ func latestMatchingVersion(availableVersions []ske.KubernetesVersion, providedVe
|
||||||
}
|
}
|
||||||
|
|
||||||
var versionUsed *string
|
var versionUsed *string
|
||||||
|
var availableVersionsArray []string
|
||||||
// Get the higher available version that matches the major and minor version provided by the user
|
// Get the higher available version that matches the major and minor version provided by the user
|
||||||
for _, v := range availableVersions {
|
for _, v := range availableVersions {
|
||||||
if v.State == nil || v.Version == nil {
|
if v.State == nil || v.Version == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
availableVersionsArray = append(availableVersionsArray, *v.Version)
|
||||||
vPreffixed := "v" + *v.Version
|
vPreffixed := "v" + *v.Version
|
||||||
if semver.MajorMinor(vPreffixed) == semver.MajorMinor(providedVersionPrefixed) &&
|
if semver.MajorMinor(vPreffixed) == semver.MajorMinor(providedVersionPrefixed) &&
|
||||||
(semver.Compare(vPreffixed, providedVersionPrefixed) == 1 || semver.Compare(vPreffixed, providedVersionPrefixed) == 0) {
|
(semver.Compare(vPreffixed, providedVersionPrefixed) == 1 || semver.Compare(vPreffixed, providedVersionPrefixed) == 0) {
|
||||||
|
|
@ -1357,7 +1359,7 @@ func latestMatchingVersion(availableVersions []ske.KubernetesVersion, providedVe
|
||||||
|
|
||||||
// Throwing error if we could not match the version with the available versions
|
// Throwing error if we could not match the version with the available versions
|
||||||
if versionUsed == nil {
|
if versionUsed == nil {
|
||||||
return nil, false, fmt.Errorf("provided version is not one of the available kubernetes versions")
|
return nil, false, fmt.Errorf("provided version is not one of the available kubernetes versions, available versions are: %s", strings.Join(availableVersionsArray, ","))
|
||||||
}
|
}
|
||||||
|
|
||||||
return versionUsed, deprecated, nil
|
return versionUsed, deprecated, nil
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue