api: don't construct upgrade conditions, use KKP logic instead (#6651)

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
kubermatic · Apr 16, 2024 · 65edba0 · 65edba0
1 parent 70cdfe7
commit 65edba0
Showing 1 changed file with 2 additions and 8 deletions.
diff --git 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
 	}