Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-01-07 05:38:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

wip: don't complain about same-version upgrades

Browse Source
This commit is contained in:
Markus Rudy 2023-12-12 13:00:56 +01:00
parent 71fe73a076
commit 1b7b22b67d
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/compatibility/compatibility.go
View File

@ -50,6 +50,17 @@ func (e *InvalidUpgradeError) Error() string {
return fmt.Sprintf("upgrading from %s to %s is not a valid upgrade: %s", e.from, e.to, e.innerErr)
}
// UnnecessaryUpgradeError is returned if both versions are the same.
type UnnecessaryUpgradeError struct {
from string
to string
}
// Error returns the String representation of this error.
func (e *UnnecessaryUpgradeError) Error() string {
return fmt.Sprintf("no upgrade required from %s to %s", e.from, e.to)
}
// EnsurePrefixV returns the input string prefixed with the letter "v", if the string doesn't already start with that letter.
func EnsurePrefixV(str string) string {
if strings.HasPrefix(str, "v") {
@ -67,7 +78,11 @@ func IsValidUpgrade(a, b string) error {
return NewInvalidUpgradeError(a, b, ErrSemVer)
}
if semver.Compare(a, b) >= 0 {
if semver.Compare(a, b) == 0 {
return &UnnecessaryUpgradeError{a, b}
}
if semver.Compare(a, b) > 0 {
return NewInvalidUpgradeError(a, b, errors.New("current version newer than or equal to new version"))
}

5
internal/constellation/helm/actionfactory.go
View File

@ -100,6 +100,11 @@ func (a actionFactory) appendNewAction(
a.log.Debug(fmt.Sprintf("Current %q version: %q", release.releaseName, currentVersion))
a.log.Debug(fmt.Sprintf("New %q version: %q", release.releaseName, newVersion))
if currentVersion.Compare(newVersion) == 0 {
// Nothing to do.
return nil
}
if !force {
// For charts we package ourselves, the version is equal to the CLI version (charts are embedded in the binary).
// We need to make sure this matches with the version in a user's config, if an upgrade should be applied.

19
internal/constellation/kubecmd/kubecmd.go
View File

@ -138,12 +138,21 @@ func (k *KubeCmd) UpgradeKubernetesVersion(ctx context.Context, kubernetesVersio
))
}
components, err := k.prepareUpdateK8s(&nodeVersion, versionConfig.ClusterVersion, versionConfig.KubernetesComponents, force)
if err != nil {
return err
}
if err := k.applyComponentsCM(ctx, components); err != nil {
return fmt.Errorf("applying k8s components ConfigMap: %w", err)
var invalidUpgradeErr *compatibility.InvalidUpgradeError
var unnecessaryUpgradeErr *compatibility.UnnecessaryUpgradeError
switch {
case err == nil:
err := k.applyComponentsCM(ctx, components)
if err != nil {
return fmt.Errorf("applying k8s components ConfigMap: %w", err)
}
case errors.As(err, &unnecessaryUpgradeErr):
return nil
case errors.As(err, &invalidUpgradeErr):
return fmt.Errorf("skipping Kubernetes upgrade: %w", err)
default:
return fmt.Errorf("updating Kubernetes version: %w", err)
}
updatedNodeVersion, err := k.applyNodeVersion(ctx, nodeVersion)