bug: clusterctl upgrade hangs for a time on CRD migration when new version contains a number of new CRDs

Author: dmvolod

cmd/clusterctl/client/cluster/crd_migration.go

@@ -91,15 +91,21 @@ func (m *crdMigrator) run(ctx context.Context, newCRD *apiextensionsv1.CustomRes
 
 	// Get the current CRD.
 	currentCRD := &apiextensionsv1.CustomResourceDefinition{}
+	crdNotFound := false
 	if err := retryWithExponentialBackoff(ctx, newReadBackoff(), func(ctx context.Context) error {
-		return m.Client.Get(ctx, client.ObjectKeyFromObject(newCRD), currentCRD)
-	}); err != nil {
-		// Return if the CRD doesn't exist yet. We only have to migrate if the CRD exists already.
+		err := m.Client.Get(ctx, client.ObjectKeyFromObject(newCRD), currentCRD)
 		if apierrors.IsNotFound(err) {
-			return false, nil
+			crdNotFound = true
+			return nil
 		}
+		return err
+	}); err != nil {
 		return false, err
 	}
+	// Return if the CRD doesn't exist yet. We only have to migrate if the CRD exists already.
+	if crdNotFound {
+		return false, nil
+	}
 
 	// Get the storage version of the current CRD.
 	currentStorageVersion, err := storageVersionForCRD(currentCRD)