Skip to content

Commit 232bc90

Browse files
Merge pull request #9019 from shubham-pampattiwar/vgs-task-3
Accommodate VGS workflows in PVC CSI plugin
2 parents ff8a070 + a73a150 commit 232bc90

File tree

56 files changed

+1704
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1704
-68
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Accommodate VGS workflows in PVC CSI plugin

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/hashicorp/go-plugin v1.6.0
2727
github.com/joho/godotenv v1.3.0
2828
github.com/kopia/kopia v0.16.0
29-
github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0
29+
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0
3030
github.com/onsi/ginkgo/v2 v2.19.0
3131
github.com/onsi/gomega v1.33.1
3232
github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
507507
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
508508
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
509509
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
510-
github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0 h1:j3YK74myEQRxR/srciTpOrm221SAvz6J5OVWbyfeXFo=
511-
github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0/go.mod h1:FlyYFe32mPxKEPaRXKNxfX576d1AoCzstYDoOOnyMA4=
510+
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0 h1:Q3jQ1NkFqv5o+F8dMmHd8SfEmlcwNeo1immFApntEwE=
511+
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0/go.mod h1:E3vdYxHj2C2q6qo8/Da4g7P+IcwqRZyy3gJBzYybV9Y=
512512
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
513513
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
514514
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=

internal/delete/actions/csi/volumesnapshotcontent_action.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
"github.com/google/uuid"
24-
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
24+
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
2525
"github.com/pkg/errors"
2626
"github.com/sirupsen/logrus"
2727
corev1api "k8s.io/api/core/v1"

internal/delete/actions/csi/volumesnapshotcontent_action_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"testing"
2323

24-
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
24+
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
2525
"github.com/pkg/errors"
2626
"github.com/sirupsen/logrus"
2727
"github.com/stretchr/testify/require"

internal/volume/volumes_information.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strings"
2323
"sync"
2424

25-
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
25+
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
2626
"github.com/pkg/errors"
2727
"github.com/sirupsen/logrus"
2828
corev1api "k8s.io/api/core/v1"

internal/volume/volumes_information_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/stretchr/testify/assert"
2525

26-
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
26+
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
2727
"github.com/sirupsen/logrus"
2828
"github.com/stretchr/testify/require"
2929
corev1api "k8s.io/api/core/v1"

pkg/apis/velero/v1/labels_annotations.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,13 @@ const (
160160

161161
// DataUploadNameAnnotation is the label key for the DataUpload name
162162
DataUploadNameAnnotation = "velero.io/data-upload-name"
163+
164+
// Label used on VolumeGroupSnapshotClass to mark it as Velero's default for a CSI driver
165+
VolumeGroupSnapshotClassDefaultLabel = "velero.io/csi-volumegroupsnapshot-class"
166+
167+
// Annotation on PVC to override the VGS class to use
168+
VolumeGroupSnapshotClassAnnotationPVC = "velero.io/csi-volume-group-snapshot-class"
169+
170+
// Annotation prefix on Backup to override VGS class per CSI driver
171+
VolumeGroupSnapshotClassAnnotationBackupPrefix = "velero.io/csi-volumegroupsnapshot-class_"
163172
)

0 commit comments

Comments
 (0)