Skip to content

Commit 737d5fc

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #864 from carlory/patch-001
check if the csi driver is supported the volume group snapshot cap
2 parents ab6f8cc + c494031 commit 737d5fc

File tree

6 files changed

+52
-11
lines changed

6 files changed

+52
-11
lines changed

‎cmd/csi-snapshotter/main.go‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,17 @@ import (
2020
"context"
2121
"flag"
2222
"fmt"
23-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/group_snapshotter"
2423
"net/http"
2524
"os"
2625
"os/signal"
2726
"strings"
2827
"time"
2928

30-
utils "github.com/kubernetes-csi/external-snapshotter/v6/pkg/utils"
31-
3229
"google.golang.org/grpc"
3330

3431
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3532
"k8s.io/apimachinery/pkg/labels"
33+
coreinformers "k8s.io/client-go/informers"
3634
"k8s.io/client-go/kubernetes"
3735
"k8s.io/client-go/kubernetes/scheme"
3836
"k8s.io/client-go/rest"
@@ -51,7 +49,8 @@ import (
5149
clientset "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned"
5250
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/scheme"
5351
informers "github.com/kubernetes-csi/external-snapshotter/client/v6/informers/externalversions"
54-
coreinformers "k8s.io/client-go/informers"
52+
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/group_snapshotter"
53+
utils "github.com/kubernetes-csi/external-snapshotter/v6/pkg/utils"
5554
)
5655

5756
const (
@@ -229,6 +228,12 @@ func main() {
229228
snapShotter := snapshotter.NewSnapshotter(csiConn)
230229
var groupSnapshotter group_snapshotter.GroupSnapshotter
231230
if *enableVolumeGroupSnapshots {
231+
supportsCreateVolumeGroupSnapshot, err := supportsGroupControllerCreateVolumeGroupSnapshot(ctx, csiConn)
232+
if err != nil {
233+
klog.Errorf("error determining if driver supports create/delete group snapshot operations: %v", err)
234+
} else if !supportsCreateVolumeGroupSnapshot {
235+
klog.Warningf("CSI driver %s does not support GroupControllerCreateVolumeGroupSnapshot when the --enable-volume-group-snapshots flag is true", driverName)
236+
}
232237
groupSnapshotter = group_snapshotter.NewGroupSnapshotter(csiConn)
233238
if len(*groupSnapshotNamePrefix) == 0 {
234239
klog.Error("group snapshot name prefix cannot be of length 0")
@@ -317,3 +322,12 @@ func supportsControllerCreateSnapshot(ctx context.Context, conn *grpc.ClientConn
317322

318323
return capabilities[csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT], nil
319324
}
325+
326+
func supportsGroupControllerCreateVolumeGroupSnapshot(ctx context.Context, conn *grpc.ClientConn) (bool, error) {
327+
capabilities, err := csirpc.GetGroupControllerCapabilities(ctx, conn)
328+
if err != nil {
329+
return false, err
330+
}
331+
332+
return capabilities[csi.GroupControllerServiceCapability_RPC_CREATE_DELETE_GET_VOLUME_GROUP_SNAPSHOT], nil
333+
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/fsnotify/fsnotify v1.6.0
99
github.com/golang/mock v1.6.0
1010
github.com/google/gofuzz v1.2.0
11-
github.com/kubernetes-csi/csi-lib-utils v0.13.0
11+
github.com/kubernetes-csi/csi-lib-utils v0.14.0
1212
github.com/kubernetes-csi/csi-test/v4 v4.4.0
1313
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.1.0
1414
github.com/prometheus/client_golang v1.16.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
124124
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
125125
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
126126
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
127-
github.com/kubernetes-csi/csi-lib-utils v0.13.0 h1:QrTdZVZbHlaSUBN9ReayBPnnF1N0edFIpUKBwVIBW3w=
128-
github.com/kubernetes-csi/csi-lib-utils v0.13.0/go.mod h1:JS9eDIZmSjx4F9o0bLTVK/qfhIIOifdjEfVXzxWapfE=
127+
github.com/kubernetes-csi/csi-lib-utils v0.14.0 h1:pusB32LkSd7GhuT8Z6cyRFqByujc28ygWV97ndaT19s=
128+
github.com/kubernetes-csi/csi-lib-utils v0.14.0/go.mod h1:uX8xidqxGJOLXtsfCCVsxWtZl/9NiLyd2DD3Nb+KoP4=
129129
github.com/kubernetes-csi/csi-test/v4 v4.4.0 h1:r0mnAwDURI24Vw3a/LyA/ga11yD5ZGuU7+REO35Na9s=
130130
github.com/kubernetes-csi/csi-test/v4 v4.4.0/go.mod h1:t1RzseMZJKy313nezI/d7TolbbiKpUZM3SXQvXxOX0w=
131131
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=

‎vendor/github.com/kubernetes-csi/csi-lib-utils/connection/connection.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/kubernetes-csi/csi-lib-utils/rpc/common.go‎

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ github.com/josharian/intern
9090
# github.com/json-iterator/go v1.1.12
9191
## explicit; go 1.12
9292
github.com/json-iterator/go
93-
# github.com/kubernetes-csi/csi-lib-utils v0.13.0
93+
# github.com/kubernetes-csi/csi-lib-utils v0.14.0
9494
## explicit; go 1.18
9595
github.com/kubernetes-csi/csi-lib-utils/connection
9696
github.com/kubernetes-csi/csi-lib-utils/leaderelection

0 commit comments

Comments
 (0)