alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add groupSnapshotNamePrefix and groupSnapshotNameUUIDLength CLI options

Browse Source
This commit is contained in:
Raunak Pradip Shah
2023-04-26 13:24:09 +05:30
parent d8d01a38e4
commit 9e2d4f6264
3 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/sidecar-controller/csi_handler.go
View File

@@ -40,11 +40,13 @@ type Handler interface {
// csiHandler is a handler that calls CSI to create/delete volume snapshot.
type csiHandler struct {
snapshotter snapshotter.Snapshotter
groupSnapshotter group_snapshotter.GroupSnapshotter
timeout time.Duration
snapshotNamePrefix string
snapshotNameUUIDLength int
snapshotter snapshotter.Snapshotter
groupSnapshotter group_snapshotter.GroupSnapshotter
timeout time.Duration
snapshotNamePrefix string
snapshotNameUUIDLength int
groupSnapshotNamePrefix string
groupSnapshotNameUUIDLength int
}
// NewCSIHandler returns a handler which includes the csi connection and Snapshot name details
@@ -54,13 +56,17 @@ func NewCSIHandler(
timeout time.Duration,
snapshotNamePrefix string,
snapshotNameUUIDLength int,
groupSnapshotNamePrefix string,
groupSnapshotNameUUIDLength int,
) Handler {
return &csiHandler{
snapshotter: snapshotter,
groupSnapshotter: groupSnapshotter,
timeout: timeout,
snapshotNamePrefix: snapshotNamePrefix,
snapshotNameUUIDLength: snapshotNameUUIDLength,
snapshotter: snapshotter,
groupSnapshotter: groupSnapshotter,
timeout: timeout,
snapshotNamePrefix: snapshotNamePrefix,
snapshotNameUUIDLength: snapshotNameUUIDLength,
groupSnapshotNamePrefix: groupSnapshotNamePrefix,
groupSnapshotNameUUIDLength: groupSnapshotNameUUIDLength,
}
}
@@ -152,7 +158,7 @@ func (handler *csiHandler) CreateGroupSnapshot(content *crdv1alpha1.VolumeGroupS
return "", "", nil, time.Time{}, false, fmt.Errorf("cannot create group snapshot. PVCs to be snapshotted not found in group snapshot content %s", content.Name)
}
groupSnapshotName, err := makeGroupSnapshotName(handler.snapshotNamePrefix, string(content.Spec.VolumeGroupSnapshotRef.UID))
groupSnapshotName, err := handler.makeGroupSnapshotName(string(content.Spec.VolumeGroupSnapshotRef.UID))
if err != nil {
return "", "", nil, time.Time{}, false, err
}
@@ -181,9 +187,13 @@ func (handler *csiHandler) GetGroupSnapshotStatus(groupSnapshotContent *crdv1alp
return csiSnapshotStatus, timestamp, nil
}
func makeGroupSnapshotName(groupSnapshotUID string) (string, error) {
func (handler *csiHandler) makeGroupSnapshotName(groupSnapshotUID string) (string, error) {
if len(groupSnapshotUID) == 0 {
return "", fmt.Errorf("group snapshot object is missing UID")
}
return fmt.Sprintf("groupsnapshot-%s", strings.Replace(groupSnapshotUID, "-", "", -1)), nil
if handler.groupSnapshotNameUUIDLength == -1 {
return fmt.Sprintf("%s-%s", handler.groupSnapshotNamePrefix, groupSnapshotUID), nil
}
return fmt.Sprintf("%s-%s", handler.groupSnapshotNamePrefix, strings.Replace(groupSnapshotUID, "-", "", -1)[0:handler.groupSnapshotNameUUIDLength]), nil
}

4
pkg/sidecar-controller/snapshot_controller_base.go
View File

@@ -85,6 +85,8 @@ func NewCSISnapshotSideCarController(
resyncPeriod time.Duration,
snapshotNamePrefix string,
snapshotNameUUIDLength int,
groupSnapshotNamePrefix string,
groupSnapshotNameUUIDLength int,
extraCreateMetadata bool,
contentRateLimiter workqueue.RateLimiter,
enableVolumeGroupSnapshots bool,
@@ -103,7 +105,7 @@ func NewCSISnapshotSideCarController(
client: client,
driverName: driverName,
eventRecorder: eventRecorder,
handler: NewCSIHandler(snapshotter, groupSnapshotter, timeout, snapshotNamePrefix, snapshotNameUUIDLength),
handler: NewCSIHandler(snapshotter, groupSnapshotter, timeout, snapshotNamePrefix, snapshotNameUUIDLength, groupSnapshotNamePrefix, groupSnapshotNameUUIDLength),
resyncPeriod: resyncPeriod,
contentStore: cache.NewStore(cache.DeletionHandlingMetaNamespaceKeyFunc),
contentQueue: workqueue.NewNamedRateLimitingQueue(contentRateLimiter, "csi-snapshotter-content"),