mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2026-05-05 12:26:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: implement upgrade version checks for Talos 1.4

Browse Source 
I missed that before cutting 1.4.0-alpha.0 release, which means
unfortunately that Talos 1.4.0-alpha.0 can't upgrade Talos
1.4.0-alpha.0.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
This commit is contained in:
Andrey Smirnov 2022-12-28 15:29:33 +04:00
parent 80f150ac85
commit fcb19ff516
No known key found for this signature in database
GPG Key ID: 7B26396447AB6DFD
5 changed files with 150 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/machinery/compatibility/kubernetes_version.go
View File

@ -10,6 +10,7 @@ import (
"github.com/hashicorp/go-version"
"github.com/siderolabs/talos/pkg/machinery/compatibility/talos13"
"github.com/siderolabs/talos/pkg/machinery/compatibility/talos14"
)
// KubernetesVersion embeds Kubernetes version.
@ -35,18 +36,24 @@ func (v *KubernetesVersion) String() string {
// SupportedWith checks if the Kubernetes version is supported with specified version of Talos.
func (v *KubernetesVersion) SupportedWith(target *TalosVersion) error {
var minK8sVersion, maxK8sVersion *version.Version
switch target.majorMinor {
case talos13.MajorMinor: // upgrades to 1.3.x
if v.version.Core().LessThan(talos13.MinimumKubernetesVersion) {
return fmt.Errorf("version of Kubernetes %s is too old to be used with Talos %s", v.version.String(), target.version.String())
}
if v.version.Core().GreaterThanOrEqual(talos13.MaximumKubernetesVersion) {
return fmt.Errorf("version of Kubernetes %s is too new to be used with Talos %s", v.version.String(), target.version.String())
}
return nil
minK8sVersion, maxK8sVersion = talos13.MinimumKubernetesVersion, talos13.MaximumKubernetesVersion
case talos14.MajorMinor: // upgrades to 1.4.x
minK8sVersion, maxK8sVersion = talos14.MinimumKubernetesVersion, talos14.MaximumKubernetesVersion
default:
return fmt.Errorf("compatibility with version %s is not supported", target.String())
}
if v.version.Core().LessThan(minK8sVersion) {
return fmt.Errorf("version of Kubernetes %s is too old to be used with Talos %s", v.version.String(), target.version.String())
}
if v.version.Core().GreaterThanOrEqual(maxK8sVersion) {
return fmt.Errorf("version of Kubernetes %s is too new to be used with Talos %s", v.version.String(), target.version.String())
}
return nil
}

33
pkg/machinery/compatibility/kubernetes_version_test.go
View File

@ -67,12 +67,41 @@ func TestKubernetesCompatibility13(t *testing.T) {
}
}
func TestKubernetesCompatibility14(t *testing.T) {
for _, tt := range []kubernetesVersionTest{
{
kubernetesVersion: "1.24.1",
target: "1.4.0",
},
{
kubernetesVersion: "1.25.3",
target: "1.4.0-beta.0",
},
{
kubernetesVersion: "1.26.0-rc.0",
target: "1.4.7",
},
{
kubernetesVersion: "1.27.0-alpha.0",
target: "1.4.0",
expectedError: "version of Kubernetes 1.27.0-alpha.0 is too new to be used with Talos 1.4.0",
},
{
kubernetesVersion: "1.23.4",
target: "1.4.0",
expectedError: "version of Kubernetes 1.23.4 is too old to be used with Talos 1.4.0",
},
} {
runKubernetesVersionTest(t, tt)
}
}
func TestKubernetesCompatibilityUnsupported(t *testing.T) {
for _, tt := range []kubernetesVersionTest{
{
kubernetesVersion: "1.25.0",
target: "1.4.0-alpha.0",
expectedError: "compatibility with version 1.4.0-alpha.0 is not supported",
target: "1.5.0-alpha.0",
expectedError: "compatibility with version 1.5.0-alpha.0 is not supported",
},
{
kubernetesVersion: "1.25.0",

26
pkg/machinery/compatibility/talos14/talos14.go Normal file
View File

@ -0,0 +1,26 @@
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
// Package talos14 provides compatibility constants for Talos 1.4
package talos14
import "github.com/hashicorp/go-version"
// MajorMinor is the major.minor version of Talos 1.4.
var MajorMinor = [2]int{1, 4}
// MinimumHostUpgradeVersion is the minimum version of Talos that can be upgraded to 1.4.
var MinimumHostUpgradeVersion = version.Must(version.NewVersion("1.0.0"))
// MaximumHostDowngradeVersion is the maximum (not inclusive) version of Talos that can be downgraded to 1.4.
var MaximumHostDowngradeVersion = version.Must(version.NewVersion("1.6.0"))
// DeniedHostUpgradeVersions are the versions of Talos that cannot be upgraded to 1.4.
var DeniedHostUpgradeVersions = []*version.Version{}
// MinimumKubernetesVersion is the minimum version of Kubernetes is supported with 1.4.
var MinimumKubernetesVersion = version.Must(version.NewVersion("1.24.0"))
// MaximumKubernetesVersion is the maximum version of Kubernetes is supported with 1.4.
var MaximumKubernetesVersion = version.Must(version.NewVersion("1.26.99"))

42
pkg/machinery/compatibility/talos_version.go
View File

@ -11,6 +11,7 @@ import (
"github.com/siderolabs/talos/pkg/machinery/api/machine"
"github.com/siderolabs/talos/pkg/machinery/compatibility/talos13"
"github.com/siderolabs/talos/pkg/machinery/compatibility/talos14"
)
// TalosVersion embeds Talos version.
@ -38,24 +39,35 @@ func (v *TalosVersion) String() string {
// UpgradeableFrom checks if the current version of Talos can be used as an upgrade for the given host version.
func (v *TalosVersion) UpgradeableFrom(host *TalosVersion) error {
var (
minHostUpgradeVersion, maxHostDowngradeVersion *version.Version
deniedHostUpgradeVersions []*version.Version
)
switch v.majorMinor {
case talos13.MajorMinor: // upgrades to 1.3.x
if host.version.Core().LessThan(talos13.MinimumHostUpgradeVersion) {
return fmt.Errorf("host version %s is too old to upgrade to Talos %s", host.version.String(), v.version.String())
}
if host.version.Core().GreaterThanOrEqual(talos13.MaximumHostDowngradeVersion) {
return fmt.Errorf("host version %s is too new to downgrade to Talos %s", host.version.String(), v.version.String())
}
for _, blacklisted := range talos13.DeniedHostUpgradeVersions {
if host.version.Equal(blacklisted) {
return fmt.Errorf("host version %s is blacklisted for upgrade to Talos %s", host.version.String(), v.version.String())
}
}
return nil
minHostUpgradeVersion, maxHostDowngradeVersion = talos13.MinimumHostUpgradeVersion, talos13.MaximumHostDowngradeVersion
deniedHostUpgradeVersions = talos13.DeniedHostUpgradeVersions
case talos14.MajorMinor: // upgrades to 1.4.x
minHostUpgradeVersion, maxHostDowngradeVersion = talos14.MinimumHostUpgradeVersion, talos14.MaximumHostDowngradeVersion
deniedHostUpgradeVersions = talos14.DeniedHostUpgradeVersions
default:
return fmt.Errorf("upgrades to version %s are not supported", v.version.String())
}
if host.version.Core().LessThan(minHostUpgradeVersion) {
return fmt.Errorf("host version %s is too old to upgrade to Talos %s", host.version.String(), v.version.String())
}
if host.version.Core().GreaterThanOrEqual(maxHostDowngradeVersion) {
return fmt.Errorf("host version %s is too new to downgrade to Talos %s", host.version.String(), v.version.String())
}
for _, denied := range deniedHostUpgradeVersions {
if host.version.Equal(denied) {
return fmt.Errorf("host version %s is denied for upgrade to Talos %s", host.version.String(), v.version.String())
}
}
return nil
}

54
pkg/machinery/compatibility/talos_version_test.go
View File

@ -81,12 +81,58 @@ func TestTalosUpgradeCompatibility13(t *testing.T) {
}
}
func TestTalosUpgradeCompatibilityUnsupported(t *testing.T) {
func TestTalosUpgradeCompatibility14(t *testing.T) {
for _, tt := range []talosVersionTest{
{
host: "1.3.0",
target: "1.4.0-alpha.0",
expectedError: `upgrades to version 1.4.0-alpha.0 are not supported`,
host: "1.3.0",
target: "1.4.0",
},
{
host: "1.0.0-alpha.0",
target: "1.4.0",
},
{
host: "1.2.0-alpha.0",
target: "1.4.0-alpha.0",
},
{
host: "1.4.0",
target: "1.4.1",
},
{
host: "1.4.0-beta.0",
target: "1.4.0",
},
{
host: "1.5.5",
target: "1.4.3",
},
{
host: "0.14.3",
target: "1.4.0",
expectedError: `host version 0.14.3 is too old to upgrade to Talos 1.4.0`,
},
{
host: "1.6.0-alpha.0",
target: "1.4.0",
expectedError: `host version 1.6.0-alpha.0 is too new to downgrade to Talos 1.4.0`,
},
} {
runTalosVersionTest(t, tt)
}
}
func TestTalosUpgradeCompatibilityUnsupported(t *testing.T) {
for _, tt := range []talosVersionTest{
{
host: "1.3.0",
target: "1.5.0-alpha.0",
expectedError: `upgrades to version 1.5.0-alpha.0 are not supported`,
},
{
host: "1.4.0",
target: "1.6.0-alpha.0",
expectedError: `upgrades to version 1.6.0-alpha.0 are not supported`,
},
} {
runTalosVersionTest(t, tt)