Rearrange order of snapshot APIs (#1979)

kanisterio · Apr 4, 2023 · 0459fea · 0459fea
1 parent 4b4b6ec
commit 0459fea
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/pkg/kube/snapshot/snapshot.go b/pkg/kube/snapshot/snapshot.go
@@ -124,13 +124,13 @@ type Source struct {
 // NewSnapshotter creates and return new Snapshotter object
 func NewSnapshotter(kubeCli kubernetes.Interface, dynCli dynamic.Interface) (Snapshotter, error) {
 	ctx := context.Background()
-	// Check if v1alpha1 snapshot API exists
-	exists, err := kube.IsGroupVersionAvailable(ctx, kubeCli.Discovery(), v1alpha1.GroupName, v1alpha1.Version)
+	// Check if v1 (stable) snapshot API exists
+	exists, err := kube.IsGroupVersionAvailable(ctx, kubeCli.Discovery(), GroupName, Version)
 	if err != nil {
 		return nil, errors.Errorf("Failed to call discovery APIs: %v", err)
 	}
 	if exists {
-		return NewSnapshotAlpha(kubeCli, dynCli), nil
+		return NewSnapshotStable(kubeCli, dynCli), nil
 	}
 	// Check if v1beta1 snapshot API exists
 	exists, err = kube.IsGroupVersionAvailable(ctx, kubeCli.Discovery(), v1beta1.GroupName, v1beta1.Version)
@@ -140,13 +140,13 @@ func NewSnapshotter(kubeCli kubernetes.Interface, dynCli dynamic.Interface) (Sna
 	if exists {
 		return NewSnapshotBeta(kubeCli, dynCli), nil
 	}
-	// Check if v1 (stable) snapshot API exists
-	exists, err = kube.IsGroupVersionAvailable(ctx, kubeCli.Discovery(), GroupName, Version)
+	// Check if v1alpha1 snapshot API exists
+	exists, err = kube.IsGroupVersionAvailable(ctx, kubeCli.Discovery(), v1alpha1.GroupName, v1alpha1.Version)
 	if err != nil {
 		return nil, errors.Errorf("Failed to call discovery APIs: %v", err)
 	}
 	if exists {
-		return NewSnapshotStable(kubeCli, dynCli), nil
+		return NewSnapshotAlpha(kubeCli, dynCli), nil
 	}
 	return nil, errors.New("Snapshot resources not supported")
 }