Merge pull request #4268 from fabriziopandini/clusterctl-v1alpha3-should-not-upgrade-to-v1alpha4

⚠️ Clusterctl v1alpha3 should not upgrade to v1alpha4

Author: k8s-ci-robot

cmd/clusterctl/client/cluster/upgrader.go

@@ -20,6 +20,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/version"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository"
@@ -100,7 +101,8 @@ func (u *providerUpgrader) Plan() ([]UpgradePlan, error) {
 		// in a management group are expected to support the same API Version of Cluster API (contract).
 		// e.g if the core provider supports v1alpha3, all the providers in the same management group should support v1alpha3 as well;
 		// all the providers in the management group can upgrade to the latest release supporting v1alpha3, or if available,
-		// or if available, all the providers in the management group can upgrade to the latest release supporting v1alpha4.
+		// all the providers in the management group can upgrade to the latest release supporting v1alpha4
+		// (not supported in current clusterctl release, but upgrade plan should report these options)
 
 		// Gets the upgrade info for the core provider.
 		coreUpgradeInfo, err := u.getUpgradeInfo(managementGroup.CoreProvider)
@@ -117,8 +119,8 @@ func (u *providerUpgrader) Plan() ([]UpgradePlan, error) {
 
 		// Creates an UpgradePlan for each contract considered for upgrades; each upgrade plans contains
 		// an UpgradeItem for each provider defining the next available version with the target contract, if available.
-		// e.g. v1alpha3, cluster-api --> v0.3.2, kubeadm bootstrap --> v0.3.2, aws --> v0.5.4
-		// e.g. v1alpha4, cluster-api --> v0.4.1, kubeadm bootstrap --> v0.4.1, aws --> v0.6.2
+		// e.g. v1alpha3, cluster-api --> v0.3.2, kubeadm bootstrap --> v0.3.2, aws --> v0.5.4 (not supported in current clusterctl release, but upgrade plan should report these options).
+		// e.g. v1alpha4, cluster-api --> v0.4.1, kubeadm bootstrap --> v0.4.1, aws --> v0.X.2 (not supported in current clusterctl release, but upgrade plan should report these options).
 		for _, contract := range contractsForUpgrade {
 			upgradePlan, err := u.getUpgradePlan(managementGroup, contract)
 			if err != nil {
@@ -140,6 +142,10 @@ func (u *providerUpgrader) Plan() ([]UpgradePlan, error) {
 }
 
 func (u *providerUpgrader) ApplyPlan(coreProvider clusterctlv1.Provider, contract string) error {
+	if contract != clusterv1.GroupVersion.Version {
+		return errors.Errorf("current version of clusterctl could only upgrade to %s contract, requested %s", clusterv1.GroupVersion.Version, contract)
+	}
+
 	log := logf.Log
 	log.Info("Performing upgrade...")
 
@@ -245,6 +251,10 @@ func (u *providerUpgrader) createCustomPlan(coreProvider clusterctlv1.Provider,
 		return nil, err
 	}
 
+	if targetContract != clusterv1.GroupVersion.Version {
+		return nil, errors.Errorf("current version of clusterctl could only upgrade to %s contract, requested %s", clusterv1.GroupVersion.Version, targetContract)
+	}
+
 	// Builds the custom upgrade plan, by adding all the upgrade items after checking consistency with the targetContract.
 	upgradeInstanceNames := sets.NewString()
 	upgradePlan := &UpgradePlan{

cmd/clusterctl/client/cluster/upgrader_info.go

@@ -44,6 +44,7 @@ type upgradeInfo struct {
 }
 
 // getUpgradeInfo returns all the info required for taking upgrade decisions for a provider.
+// NOTE: This could contain also versions for the previous or next Cluster API contract (not supported in current clusterctl release, but upgrade plan should report this options).
 func (u *providerUpgrader) getUpgradeInfo(provider clusterctlv1.Provider) (*upgradeInfo, error) {
 	// Gets the list of versions available in the provider repository.
 	configRepository, err := u.configClient.Providers().Get(provider.ProviderName, provider.GetProviderType())
@@ -96,6 +97,7 @@ func (u *providerUpgrader) getUpgradeInfo(provider clusterctlv1.Provider) (*upgr
 	// Filters the versions to be considered for upgrading the provider (next
 	// versions) and checks if the releaseSeries defined in metadata includes
 	// all of them.
+	// NOTE: This could contain also versions for the previous or next Cluster API contract (not supported in current clusterctl release, but upgrade plan should report this options).
 	nextVersions := []version.Version{}
 	for _, repositoryVersion := range repositoryVersions {
 		// we are ignoring the conversion error here because a first check already passed above
@@ -144,9 +146,7 @@ func newUpgradeInfo(metadata *clusterctlv1.Metadata, currentVersion *version.Ver
 	}
 }
 
-// getContractsForUpgrade return the list of API Version of Cluster API (contract) version available for a provider upgrade. e.g.
-// - If the current version of the provider support v1alpha3 contract (the latest), it returns v1alpha3
-// - If the current version of the provider support v1alpha3 contract but there is also the v1alpha4 contract available, it returns v1alpha3, v1alpha4
+// getContractsForUpgrade return the list of API Version of Cluster API (contract) version available for a provider upgrade.
 func (i *upgradeInfo) getContractsForUpgrade() []string {
 	contractsForUpgrade := sets.NewString()
 	for _, releaseSeries := range i.metadata.ReleaseSeries {