Merge branch 'master' into mysql-blueprint-kopia-repository-server

kanisterio · Sep 14, 2023 · 18045ae · 18045ae
2 parents a478c57 + 5f409fa
commit 18045ae
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 0 deletions.
diff --git a/pkg/kube/snapshot/mocks/mock_snapshotter.go b/pkg/kube/snapshot/mocks/mock_snapshotter.go
diff --git a/pkg/kube/snapshot/snapshot.go b/pkg/kube/snapshot/snapshot.go
@@ -19,6 +19,7 @@ import (
 
 	v1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	"github.com/pkg/errors"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 
@@ -111,6 +112,8 @@ type Snapshotter interface {
 	// List will list the volumesnapshots in a namespace that match search. If labels aren't provided,
 	// it will list all the snapshots in the namespace
 	List(ctx context.Context, namespace string, labels map[string]string) (*v1.VolumeSnapshotList, error)
+	// GroupVersion returns the group and version according to snapshotter version
+	GroupVersion(ctx context.Context) schema.GroupVersion
 }
 
 // Source represents the CSI source of the Volumesnapshot.

diff --git a/pkg/kube/snapshot/snapshot_alpha.go b/pkg/kube/snapshot/snapshot_alpha.go
@@ -338,6 +338,12 @@ func (sna *SnapshotAlpha) WaitOnReadyToUse(ctx context.Context, snapshotName, na
 	})
 }
 
+func (sna *SnapshotAlpha) GroupVersion(ctx context.Context) schema.GroupVersion {
+	return schema.GroupVersion{
+		Group:   v1alpha1.GroupName,
+		Version: v1alpha1.Version,
+	}
+}
 func (sna *SnapshotAlpha) getContent(ctx context.Context, contentName string) (*v1alpha1.VolumeSnapshotContent, error) {
 	us, err := sna.dynCli.Resource(v1alpha1.VolSnapContentGVR).Get(ctx, contentName, metav1.GetOptions{})
 	if err != nil {

diff --git a/pkg/kube/snapshot/snapshot_beta.go b/pkg/kube/snapshot/snapshot_beta.go
@@ -265,6 +265,13 @@ func (sna *SnapshotBeta) UpdateVolumeSnapshotStatusBeta(ctx context.Context, nam
 	return updateVolumeSnapshotStatus(ctx, sna.dynCli, v1beta1.VolSnapGVR, namespace, snapshotName, readyToUse)
 }
 
+func (sna *SnapshotBeta) GroupVersion(ctx context.Context) schema.GroupVersion {
+	return schema.GroupVersion{
+		Group:   v1beta1.GroupName,
+		Version: v1beta1.Version,
+	}
+}
+
 func updateVolumeSnapshotStatus(ctx context.Context, dynCli dynamic.Interface, snapGVR schema.GroupVersionResource, namespace string, snapshotName string, readyToUse bool) error {
 	us, err := dynCli.Resource(snapGVR).Namespace(namespace).Get(ctx, snapshotName, metav1.GetOptions{})
 	if err != nil {

diff --git a/pkg/kube/snapshot/snapshot_stable.go b/pkg/kube/snapshot/snapshot_stable.go
@@ -169,3 +169,10 @@ func (sna *SnapshotStable) CreateContentFromSource(ctx context.Context, source *
 func (sna *SnapshotStable) WaitOnReadyToUse(ctx context.Context, snapshotName, namespace string) error {
 	return waitOnReadyToUse(ctx, sna.dynCli, VolSnapGVR, snapshotName, namespace)
 }
+
+func (sna *SnapshotStable) GroupVersion(ctx context.Context) schema.GroupVersion {
+	return schema.GroupVersion{
+		Group:   GroupName,
+		Version: Version,
+	}
+}