Address review comments

Author: leonardoce

client/apis/volumegroupsnapshot/v1alpha1/types.go

@@ -107,16 +107,16 @@ type VolumeGroupSnapshotStatus struct {
 	// is part of this group snapshot.
 	// The maximum number of allowed snapshots in the group is 100.
 	// +optional
-	PVCVolumeSnapshotRefList []PVCVolumeSnapshotPair `json:"pvcVolumeSnapshotRefList,omitempty" protobuf:"bytes,6,opt,name=pvcVolumeSnapshotRefList"`
+	PVCVolumeSnapshotRefList []PVCVolumeSnapshotPair `json:"pvcVolumeSnapshotRefList,omitempty" protobuf:"bytes,5,opt,name=pvcVolumeSnapshotRefList"`
 }
 
-// PVCVolumeSnapshotPair defines a pair of a PVC reference and a Volume Snapshot
+// PVCVolumeSnapshotPair defines a pair of a PVC reference and a Volume Snapshot Reference
 type PVCVolumeSnapshotPair struct {
 	// PersistentVolumeClaimRef is a reference to the PVC this pair is referring to
 	PersistentVolumeClaimRef core_v1.ObjectReference `json:"persistentVolumeClaimRef,omitempty" protobuf:"bytes,1,opt,name=persistentVolumeClaimRef"`
 
 	// VolumeSnapshotRef is a reference to the VolumeSnapshot this pair is referring to
-	VolumeSnapshotRef core_v1.ObjectReference `json:"volumeSnapshotRef,omitempty" protobuf:"bytes,1,opt,name=volumeSnapshotRef"`
+	VolumeSnapshotRef core_v1.ObjectReference `json:"volumeSnapshotRef,omitempty" protobuf:"bytes,2,opt,name=volumeSnapshotRef"`
 }
 
 //+genclient
@@ -346,11 +346,11 @@ type VolumeGroupSnapshotContentStatus struct {
 	// +optional
 	Error *snapshotv1.VolumeSnapshotError `json:"error,omitempty" protobuf:"bytes,4,opt,name=error,casttype=VolumeSnapshotError"`
 
-	// PVVolumeSnapshotContentRefList is the list of pairs of PV and
-	// VolumeSnapshotCOntent for this group snapshot
+	// PVVolumeSnapshotContentList is the list of pairs of PV and
+	// VolumeSnapshotContent for this group snapshot
 	// The maximum number of allowed snapshots in the group is 100.
 	// +optional
-	PVVolumeSnapshotContentRefList []PVVolumeSnapshotContentPair `json:"pvVolumeSnapshotContentRefList,omitempty" protobuf:"bytes,6,opt,name=pvVolumeSnapshotContentRefList"`
+	PVVolumeSnapshotContentList []PVVolumeSnapshotContentPair `json:"pvVolumeSnapshotContentList,omitempty" protobuf:"bytes,5,opt,name=pvVolumeSnapshotContentRefList"`
 }
 
 // PVVolumeSnapshotContentPair represent a pair of PV names and
@@ -360,7 +360,7 @@ type PVVolumeSnapshotContentPair struct {
 	PersistentVolumeName string `json:"persistentVolumeName,omitempty" protobuf:"bytes,1,opt,name=persistentVolumeName"`
 
 	// VolumeSnapshotContentName is the name of the volume snapshot content resource
-	VolumeSnapshotContentName string `json:"volumeSnapshotContentName,omitempty" protobuf:"bytes,1,opt,name=volumeSnapshotContentName"`
+	VolumeSnapshotContentName string `json:"volumeSnapshotContentName,omitempty" protobuf:"bytes,2,opt,name=volumeSnapshotContentName"`
 }
 
 // VolumeGroupSnapshotContentSource represents the CSI source of a group snapshot.

client/apis/volumegroupsnapshot/v1alpha1/zz_generated.deepcopy.go

@@ -227,10 +227,10 @@ spec:
                     format: date-time
                     type: string
                 type: object
-              pvVolumeSnapshotContentRefList:
-                description: PVVolumeSnapshotContentRefList is the list of pairs of
-                  PV and VolumeSnapshotCOntent for this group snapshot The maximum
-                  number of allowed snapshots in the group is 100.
+              pvVolumeSnapshotContentList:
+                description: PVVolumeSnapshotContentList is the list of pairs of PV
+                  and VolumeSnapshotContent for this group snapshot The maximum number
+                  of allowed snapshots in the group is 100.
                 items:
                   description: PVVolumeSnapshotContentPair represent a pair of PV
                     names and VolumeSnapshotContent names

client/config/crd/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml

@@ -189,7 +189,7 @@ spec:
                   allowed snapshots in the group is 100.
                 items:
                   description: PVCVolumeSnapshotPair defines a pair of a PVC reference
-                    and a Volume Snapshot
+                    and a Volume Snapshot Reference
                   properties:
                     persistentVolumeClaimRef:
                       description: PersistentVolumeClaimRef is a reference to the

client/config/crd/groupsnapshot.storage.k8s.io_volumegroupsnapshots.yaml

@@ -565,8 +565,8 @@ func (ctrl *csiSnapshotCommonController) updateGroupSnapshotStatus(groupSnapshot
 	}
 
 	var pvcVolumeSnapshotRefList []crdv1alpha1.PVCVolumeSnapshotPair
-	if groupSnapshotContent.Status != nil && len(groupSnapshotContent.Status.PVVolumeSnapshotContentRefList) != 0 {
-		for _, contentRef := range groupSnapshotContent.Status.PVVolumeSnapshotContentRefList {
+	if groupSnapshotContent.Status != nil && len(groupSnapshotContent.Status.PVVolumeSnapshotContentList) != 0 {
+		for _, contentRef := range groupSnapshotContent.Status.PVVolumeSnapshotContentList {
 			groupSnapshotContent, err := ctrl.contentLister.Get(contentRef.VolumeSnapshotContentName)
 			if err != nil {
 				return nil, fmt.Errorf("failed to get group snapshot content %s from group snapshot content store: %v", contentRef.VolumeSnapshotContentName, err)

pkg/common-controller/groupsnapshot_controller_helper.go

@@ -240,8 +240,8 @@ func (ctrl *csiSnapshotSideCarController) deleteCSIGroupSnapshotOperation(groupS
 	}
 
 	var snapshotIDs []string
-	if groupSnapshotContent.Status != nil && len(groupSnapshotContent.Status.PVVolumeSnapshotContentRefList) != 0 {
-		for _, contentRef := range groupSnapshotContent.Status.PVVolumeSnapshotContentRefList {
+	if groupSnapshotContent.Status != nil && len(groupSnapshotContent.Status.PVVolumeSnapshotContentList) != 0 {
+		for _, contentRef := range groupSnapshotContent.Status.PVVolumeSnapshotContentList {
 			snapshotContent, err := ctrl.contentLister.Get(contentRef.VolumeSnapshotContentName)
 			if err != nil {
 				return fmt.Errorf("failed to get snapshot content %s from snapshot content store: %v", contentRef.VolumeSnapshotContentName, err)
@@ -283,7 +283,7 @@ func (ctrl *csiSnapshotSideCarController) clearGroupSnapshotContentStatus(
 		groupSnapshotContent.Status.ReadyToUse = nil
 		groupSnapshotContent.Status.CreationTime = nil
 		groupSnapshotContent.Status.Error = nil
-		groupSnapshotContent.Status.PVVolumeSnapshotContentRefList = nil
+		groupSnapshotContent.Status.PVVolumeSnapshotContentList = nil
 	}
 	newContent, err := ctrl.clientset.GroupsnapshotV1alpha1().VolumeGroupSnapshotContents().UpdateStatus(context.TODO(), groupSnapshotContent, metav1.UpdateOptions{})
 	if err != nil {
@@ -650,7 +650,7 @@ func (ctrl *csiSnapshotSideCarController) updateGroupSnapshotContentStatus(
 			CreationTime:              &createdAt,
 		}
 		for _, name := range snapshotContentNames {
-			newStatus.PVVolumeSnapshotContentRefList = append(newStatus.PVVolumeSnapshotContentRefList, crdv1alpha1.PVVolumeSnapshotContentPair{
+			newStatus.PVVolumeSnapshotContentList = append(newStatus.PVVolumeSnapshotContentList, crdv1alpha1.PVVolumeSnapshotContentPair{
 				VolumeSnapshotContentName: name,
 			})
 		}
@@ -672,9 +672,9 @@ func (ctrl *csiSnapshotSideCarController) updateGroupSnapshotContentStatus(
 			newStatus.CreationTime = &createdAt
 			updated = true
 		}
-		if len(newStatus.PVVolumeSnapshotContentRefList) == 0 {
+		if len(newStatus.PVVolumeSnapshotContentList) == 0 {
 			for _, name := range snapshotContentNames {
-				newStatus.PVVolumeSnapshotContentRefList = append(newStatus.PVVolumeSnapshotContentRefList, crdv1alpha1.PVVolumeSnapshotContentPair{
+				newStatus.PVVolumeSnapshotContentList = append(newStatus.PVVolumeSnapshotContentList, crdv1alpha1.PVVolumeSnapshotContentPair{
 					VolumeSnapshotContentName: name,
 				})
 			}