From 65edba06cf53dc5a1bbb54e08d885e70f813316b Mon Sep 17 00:00:00 2001 From: Marvin Beckers Date: Tue, 16 Apr 2024 14:57:01 +0200 Subject: [PATCH] api: don't construct upgrade conditions, use KKP logic instead (#6651) Signed-off-by: Marvin Beckers --- modules/api/pkg/handler/common/upgrade.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/api/pkg/handler/common/upgrade.go b/modules/api/pkg/handler/common/upgrade.go index e8a15e2c2e..5e9e39e216 100644 --- a/modules/api/pkg/handler/common/upgrade.go +++ b/modules/api/pkg/handler/common/upgrade.go @@ -34,6 +34,7 @@ import ( utilerrors "k8c.io/kubermatic/v2/pkg/util/errors" "k8c.io/kubermatic/v2/pkg/validation/nodeupdate" "k8c.io/kubermatic/v2/pkg/version" + clusterversion "k8c.io/kubermatic/v2/pkg/version/cluster" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -66,13 +67,6 @@ func GetUpgradesEndpoint(ctx context.Context, userInfoGetter provider.UserInfoGe if err != nil { return nil, fmt.Errorf("failed to get the cloud provider name: %w", err) } - var updateConditions []kubermaticv1.ConditionType - externalCloudProvider := cluster.Spec.Features[kubermaticv1.ClusterFeatureExternalCloudProvider] - if externalCloudProvider { - updateConditions = append(updateConditions, kubermaticv1.ExternalCloudProviderCondition) - } else { - updateConditions = append(updateConditions, kubermaticv1.InTreeCloudProviderCondition) - } config, err := configGetter(ctx) if err != nil { @@ -81,7 +75,7 @@ func GetUpgradesEndpoint(ctx context.Context, userInfoGetter provider.UserInfoGe versionManager := version.NewFromConfiguration(config) - versions, err := versionManager.GetPossibleUpdates(cluster.Spec.Version.String(), kubermaticv1.ProviderType(providerName), updateConditions...) + versions, err := versionManager.GetPossibleUpdates(cluster.Spec.Version.String(), kubermaticv1.ProviderType(providerName), clusterversion.GetVersionConditions(&cluster.Spec)...) if err != nil { return nil, err }