clusterctl: don't run crd migration if storedVersions is equal to sto…

…rageVersion

cmd/clusterctl/client/cluster/crd_migration.go

@@ -117,7 +117,7 @@ func (m *crdMigrator) run(ctx context.Context, newCRD *apiextensionsv1.CustomRes
 	currentStatusStoredVersions := sets.Set[string]{}.Insert(currentCRD.Status.StoredVersions...)
 	// If the new CRD still contains all current stored versions, nothing to do
 	// as no previous storage version will be dropped.
-	if servedVersions.HasAll(currentStatusStoredVersions.UnsortedList()...) {
+	if servedVersions.HasAll(currentStatusStoredVersions.UnsortedList()...) || (currentStatusStoredVersions.Len() == 1 && currentStatusStoredVersions.Has(currentStorageVersion)) {
 		log.V(2).Info("CRD migration check passed", "name", newCRD.Name)
 		return false, nil
 	}

cmd/clusterctl/client/cluster/crd_migration_test.go

@@ -111,6 +111,28 @@ func Test_CRDMigrator(t *testing.T) {
 			},
 			wantIsMigrated: false,
 		},
+		{
+			name: "No-op if new CRD adds a new versions and unserves the old",
+			currentCRD: &apiextensionsv1.CustomResourceDefinition{
+				ObjectMeta: metav1.ObjectMeta{Name: "foo"},
+				Spec: apiextensionsv1.CustomResourceDefinitionSpec{
+					Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
+						{Name: "v1alpha1", Storage: true, Served: true},
+					},
+				},
+				Status: apiextensionsv1.CustomResourceDefinitionStatus{StoredVersions: []string{"v1alpha1"}},
+			},
+			newCRD: &apiextensionsv1.CustomResourceDefinition{
+				ObjectMeta: metav1.ObjectMeta{Name: "foo"},
+				Spec: apiextensionsv1.CustomResourceDefinitionSpec{
+					Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
+						{Name: "v1beta1", Storage: true, Served: true}, // v1beta1 is being added
+						{Name: "v1alpha1", Served: false},              // v1alpha1 still exists but is not served anymore
+					},
+				},
+			},
+			wantIsMigrated: false,
+		},
 		{
 			name: "Fails if new CRD drops current storage version",
 			currentCRD: &apiextensionsv1.CustomResourceDefinition{