Set new fields in VolumeGroupSnapshotContent objects

This patch improves the sidecar to set the fields introduced by the
VolumeGroupSnapshotContent v1beta2 API when dynamically provisioning a
VolumeGroupSnapshot.

This information is then used by the common snapshot controller to set
the status of the member VolumeSnapshotContent objects, allowing the
relative fields to be set even when the CSI driver does not implement
the ListSnapshots RPC call.

Author: leonardoce

pkg/common-controller/groupsnapshot_controller_helper.go

@@ -580,8 +580,9 @@ func (ctrl *csiSnapshotCommonController) createSnapshotsForGroupSnapshotContent(
 					VolumeHandle: &volumeHandle,
 				},
 			},
-			// The status will be set by VolumeSnapshotContent reconciler
-			// in the CSI snapshotter sidecar.
+			// The status will be set in a separate patch request by
+			// common snapshot controller, using the information from
+			// the VolumeGroupSnapshotContent object.
 		}
 
 		if pv != nil {
@@ -682,6 +683,21 @@ func (ctrl *csiSnapshotCommonController) createSnapshotsForGroupSnapshotContent(
 				Path:  "/status/volumeGroupSnapshotHandle",
 				Value: groupSnapshotContent.Status.VolumeGroupSnapshotHandle,
 			},
+			{
+				Op:    "replace",
+				Path:  "/status/creationTime",
+				Value: snapshot.CreationTime,
+			},
+			{
+				Op:    "replace",
+				Path:  "/status/restoreSize",
+				Value: snapshot.RestoreSize,
+			},
+			{
+				Op:    "replace",
+				Path:  "/status/readyToUse",
+				Value: snapshot.ReadyToUse,
+			},
 		}, ctrl.clientset, "status")
 		if err != nil {
 			return groupSnapshotContent, fmt.Errorf(

pkg/sidecar-controller/groupsnapshot_helper.go

@@ -30,6 +30,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	klog "k8s.io/klog/v2"
 
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	crdv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2"
 	crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
 	"github.com/kubernetes-csi/external-snapshotter/v8/pkg/utils"
@@ -439,15 +440,13 @@ func (ctrl *csiSnapshotSideCarController) createGroupSnapshotWrapper(groupSnapsh
 	}
 
 	// Create individual snapshots and snapshot contents
-	var snapshotContentLinks []snapshotContentNameVolumeHandlePair
-	for _, snapshot := range snapshots {
-		snapshotContentLinks = append(snapshotContentLinks, snapshotContentNameVolumeHandlePair{
-			snapshotHandle: snapshot.SnapshotId,
-			volumeHandle:   snapshot.SourceVolumeId,
-		})
-	}
-
-	newGroupSnapshotContent, err := ctrl.updateGroupSnapshotContentStatus(groupSnapshotContent, groupSnapshotID, readyToUse, metav1.NewTime(creationTime), snapshotContentLinks)
+	newGroupSnapshotContent, err := ctrl.updateGroupSnapshotContentStatus(
+		groupSnapshotContent,
+		groupSnapshotID,
+		readyToUse,
+		metav1.NewTime(creationTime),
+		snapshots,
+	)
 	if err != nil {
 		klog.Errorf("error updating status for volume group snapshot content %s: %v.", groupSnapshotContent.Name, err)
 		return groupSnapshotContent, fmt.Errorf("error updating status for volume group snapshot content %s: %v", groupSnapshotContent.Name, err)
@@ -583,7 +582,7 @@ func (ctrl *csiSnapshotSideCarController) updateGroupSnapshotContentStatus(
 	groupSnapshotHandle string,
 	readyToUse bool,
 	createdAt metav1.Time,
-	snapshotContentLinks []snapshotContentNameVolumeHandlePair,
+	snapshotList []*csi.Snapshot,
 ) (*crdv1beta2.VolumeGroupSnapshotContent, error) {
 	klog.V(5).Infof("updateGroupSnapshotContentStatus: updating VolumeGroupSnapshotContent [%s], groupSnapshotHandle %s, readyToUse %v, createdAt %v", groupSnapshotContent.Name, groupSnapshotHandle, readyToUse, createdAt)
 
@@ -600,11 +599,13 @@ func (ctrl *csiSnapshotSideCarController) updateGroupSnapshotContentStatus(
 			ReadyToUse:                &readyToUse,
 			CreationTime:              &createdAt,
 		}
-		for _, snapshotContentLink := range snapshotContentLinks {
-
+		for _, snapshot := range snapshotList {
 			newStatus.VolumeSnapshotInfoList = append(newStatus.VolumeSnapshotInfoList, crdv1beta2.VolumeSnapshotInfo{
-				VolumeHandle:   snapshotContentLink.volumeHandle,
-				SnapshotHandle: snapshotContentLink.snapshotHandle,
+				VolumeHandle:   snapshot.SourceVolumeId,
+				SnapshotHandle: snapshot.SnapshotId,
+				CreationTime:   utils.CsiTimestampToKubernetes(snapshot.CreationTime),
+				ReadyToUse:     &snapshot.ReadyToUse,
+				RestoreSize:    utils.CsiSizeToKubernetes(snapshot.SizeBytes),
 			})
 		}
 
@@ -627,10 +628,13 @@ func (ctrl *csiSnapshotSideCarController) updateGroupSnapshotContentStatus(
 			updated = true
 		}
 		if len(newStatus.VolumeSnapshotInfoList) == 0 {
-			for _, snapshotContentLink := range snapshotContentLinks {
+			for _, snapshot := range snapshotList {
 				newStatus.VolumeSnapshotInfoList = append(newStatus.VolumeSnapshotInfoList, crdv1beta2.VolumeSnapshotInfo{
-					VolumeHandle:   snapshotContentLink.volumeHandle,
-					SnapshotHandle: snapshotContentLink.snapshotHandle,
+					VolumeHandle:   snapshot.SourceVolumeId,
+					SnapshotHandle: snapshot.SnapshotId,
+					CreationTime:   utils.CsiTimestampToKubernetes(snapshot.CreationTime),
+					ReadyToUse:     &snapshot.ReadyToUse,
+					RestoreSize:    utils.CsiSizeToKubernetes(snapshot.SizeBytes),
 				})
 			}
 			updated = true
@@ -793,7 +797,7 @@ func (ctrl *csiSnapshotSideCarController) checkandUpdateGroupSnapshotContentStat
 		}
 
 		// TODO: Get a reference to snapshot contents for this volume group snapshot
-		updatedContent, err := ctrl.updateGroupSnapshotContentStatus(groupSnapshotContent, groupSnapshotID, readyToUse, metav1.NewTime(creationTime), []snapshotContentNameVolumeHandlePair{})
+		updatedContent, err := ctrl.updateGroupSnapshotContentStatus(groupSnapshotContent, groupSnapshotID, readyToUse, metav1.NewTime(creationTime), []*csi.Snapshot{})
 		if err != nil {
 			return groupSnapshotContent, err
 		}

pkg/utils/conversion.go

@@ -0,0 +1,40 @@
+/*
+Copyright 2025 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package utils
+
+import "google.golang.org/protobuf/types/known/timestamppb"
+
+// CsiTimestampToKubernetes converts a CSI timestamp in the format
+// used by the Snapshot API
+func CsiTimestampToKubernetes(creationTime *timestamppb.Timestamp) *int64 {
+	if creationTime == nil {
+		return nil
+	}
+
+	result := creationTime.AsTime().UnixNano()
+	return &result
+}
+
+// CsiSizeToKubernetes converts the size to the format used by
+// the Snapshot API
+func CsiSizeToKubernetes(sizeBytes int64) *int64 {
+	if sizeBytes == 0 {
+		return nil
+	}
+
+	return &sizeBytes
+}

pkg/utils/conversion_test.go

@@ -0,0 +1,44 @@
+/*
+Copyright 2025 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package utils
+
+import (
+	"testing"
+
+	"google.golang.org/protobuf/types/known/timestamppb"
+)
+
+func TestCsiSizeToKubernetes(t *testing.T) {
+	if CsiSizeToKubernetes(0) != nil {
+		t.Error("Expected nil")
+	}
+
+	if *CsiSizeToKubernetes(123) != 123 {
+		t.Error("Wrong size conversion")
+	}
+}
+
+func TestCsiTimestampToKubernetes(t *testing.T) {
+	if CsiTimestampToKubernetes(nil) != nil {
+		t.Error("Expected nil")
+	}
+
+	now := timestamppb.Now()
+	if *CsiTimestampToKubernetes(now) != now.AsTime().UnixNano() {
+		t.Error("Expected correct time conversion")
+	}
+}