Merge pull request #1199 from leonardoce/remove-pvvolumesnapshotcontentlist

Remove PVVolumeSnapshotContentList field from the VolumeGroupSnapshotContentStatus API

Author: k8s-ci-robot

client/apis/volumegroupsnapshot/v1alpha1/types.go

@@ -353,12 +353,6 @@ type VolumeGroupSnapshotContentStatus struct {
 	// +optional
 	Error *snapshotv1.VolumeSnapshotError `json:"error,omitempty" protobuf:"bytes,4,opt,name=error,casttype=VolumeSnapshotError"`
 
-	// 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
-	PVVolumeSnapshotContentList []PVVolumeSnapshotContentPair `json:"pvVolumeSnapshotContentList,omitempty" protobuf:"bytes,5,opt,name=pvVolumeSnapshotContentRefList"`
-
 	// VolumeSnapshotHandlePairList is a list of CSI "volume_id" and "snapshot_id"
 	// pair returned by the CSI driver to identify snapshots and their source volumes
 	// on the storage system.

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

@@ -274,42 +274,6 @@ spec:
                     format: date-time
                     type: string
                 type: object
-              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
-                  properties:
-                    persistentVolumeRef:
-                      description: PersistentVolumeRef is a reference to the persistent
-                        volume resource
-                      properties:
-                        name:
-                          description: |-
-                            Name of the referent.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Add other useful fields. apiVersion, kind, uid?
-                          type: string
-                      type: object
-                      x-kubernetes-map-type: atomic
-                    volumeSnapshotContentRef:
-                      description: VolumeSnapshotContentRef is a reference to the
-                        volume snapshot content resource
-                      properties:
-                        name:
-                          description: |-
-                            Name of the referent.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Add other useful fields. apiVersion, kind, uid?
-                          type: string
-                      type: object
-                      x-kubernetes-map-type: atomic
-                  type: object
-                type: array
               readyToUse:
                 description: |-
                   ReadyToUse indicates if all the individual snapshots in the group are ready to be

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

@@ -533,11 +533,7 @@ func (ctrl *csiSnapshotCommonController) createSnapshotsForGroupSnapshotContent(
 		"createSnapshotsForGroupSnapshotContent[%s]: creating volumesnapshots and volumesnapshotcontent for group snapshot content",
 		groupSnapshotContent.Name)
 
-	groupSnapshotContent.Status.PVVolumeSnapshotContentList = make(
-		[]crdv1alpha1.PVVolumeSnapshotContentPair,
-		len(groupSnapshotContent.Status.VolumeSnapshotHandlePairList),
-	)
-	for i, snapshot := range groupSnapshotContent.Status.VolumeSnapshotHandlePairList {
+	for _, snapshot := range groupSnapshotContent.Status.VolumeSnapshotHandlePairList {
 		snapshotHandle := snapshot.SnapshotHandle
 		volumeHandle := snapshot.VolumeHandle
 
@@ -619,17 +615,6 @@ func (ctrl *csiSnapshotCommonController) createSnapshotsForGroupSnapshotContent(
 				"createSnapshotsForGroupSnapshotContent: creating volumesnapshot %w", err)
 		}
 
-		groupSnapshotContent.Status.PVVolumeSnapshotContentList[i] = crdv1alpha1.PVVolumeSnapshotContentPair{
-			VolumeSnapshotContentRef: v1.LocalObjectReference{
-				Name: volumeSnapshotContentName,
-			},
-		}
-		if pv != nil {
-			groupSnapshotContent.Status.PVVolumeSnapshotContentList[i].PersistentVolumeRef = v1.LocalObjectReference{
-				Name: pv.Name,
-			}
-		}
-
 		// bind the volume snapshot content to the volume snapshot
 		// like a dynamically provisioned snapshot would do
 		volumeSnapshotContent.Spec.VolumeSnapshotRef.UID = createdVolumeSnapshot.UID
@@ -665,24 +650,7 @@ func (ctrl *csiSnapshotCommonController) createSnapshotsForGroupSnapshotContent(
 		}
 	}
 
-	// Phase 2: set the backlinks
-	var patches []utils.PatchOp
-	patches = append(patches, utils.PatchOp{
-		Op:    "replace",
-		Path:  "/status/pvVolumeSnapshotContentList",
-		Value: groupSnapshotContent.Status.PVVolumeSnapshotContentList,
-	})
-
-	newGroupSnapshotObj, err := utils.PatchVolumeGroupSnapshotContent(
-		groupSnapshotContent,
-		patches,
-		ctrl.clientset,
-		"status")
-	if err != nil {
-		return nil, newControllerUpdateError(utils.GroupSnapshotKey(groupSnapshot), err.Error())
-	}
-
-	return newGroupSnapshotObj, nil
+	return groupSnapshotContent, nil
 }
 
 // findPersistentVolumeByCSIDriverHandle looks at an existing PersistentVolume
@@ -836,50 +804,6 @@ func (ctrl *csiSnapshotCommonController) updateGroupSnapshotStatus(groupSnapshot
 		volumeSnapshotErr = groupSnapshotContent.Status.Error.DeepCopy()
 	}
 
-	var pvcVolumeSnapshotRefList []crdv1alpha1.PVCVolumeSnapshotPair
-	if groupSnapshotContent.Status != nil && len(groupSnapshotContent.Status.PVVolumeSnapshotContentList) != 0 {
-		for _, contentRef := range groupSnapshotContent.Status.PVVolumeSnapshotContentList {
-			var pvcReference v1.LocalObjectReference
-			pv, err := ctrl.client.CoreV1().PersistentVolumes().Get(context.TODO(), contentRef.PersistentVolumeRef.Name, metav1.GetOptions{})
-			if err != nil {
-				if apierrs.IsNotFound(err) {
-					klog.Errorf(
-						"updateGroupSnapshotStatus[%s]: PV [%s] not found",
-						utils.GroupSnapshotKey(groupSnapshot),
-						contentRef.PersistentVolumeRef.Name,
-					)
-				} else {
-					klog.Errorf(
-						"updateGroupSnapshotStatus[%s]: unable to get PV [%s] from the API server: %q",
-						utils.GroupSnapshotKey(groupSnapshot),
-						contentRef.PersistentVolumeRef.Name,
-						err.Error(),
-					)
-				}
-			} else {
-				if pv.Spec.ClaimRef != nil {
-					pvcReference.Name = pv.Spec.ClaimRef.Name
-				} else {
-					klog.Errorf(
-						"updateGroupSnapshotStatus[%s]: PV [%s] is not bound",
-						utils.GroupSnapshotKey(groupSnapshot),
-						contentRef.PersistentVolumeRef.Name)
-				}
-			}
-
-			volumeSnapshotContent, err := ctrl.contentLister.Get(contentRef.VolumeSnapshotContentRef.Name)
-			if err != nil {
-				return nil, fmt.Errorf("failed to get snapshot content %s from snapshot content store: %v", contentRef.VolumeSnapshotContentRef.Name, err)
-			}
-			pvcVolumeSnapshotRefList = append(pvcVolumeSnapshotRefList, crdv1alpha1.PVCVolumeSnapshotPair{
-				VolumeSnapshotRef: v1.LocalObjectReference{
-					Name: volumeSnapshotContent.Spec.VolumeSnapshotRef.Name,
-				},
-				PersistentVolumeClaimRef: pvcReference,
-			})
-		}
-	}
-
 	klog.V(5).Infof("updateGroupSnapshotStatus: updating VolumeGroupSnapshot [%+v] based on VolumeGroupSnapshotContentStatus [%+v]", groupSnapshot, groupSnapshotContent.Status)
 
 	groupSnapshotObj, err := ctrl.clientset.GroupsnapshotV1alpha1().VolumeGroupSnapshots(groupSnapshot.Namespace).Get(context.TODO(), groupSnapshot.Name, metav1.GetOptions{})
@@ -900,9 +824,6 @@ func (ctrl *csiSnapshotCommonController) updateGroupSnapshotStatus(groupSnapshot
 		if volumeSnapshotErr != nil {
 			newStatus.Error = volumeSnapshotErr
 		}
-		if len(pvcVolumeSnapshotRefList) == 0 {
-			newStatus.PVCVolumeSnapshotRefList = pvcVolumeSnapshotRefList
-		}
 
 		updated = true
 	} else {
@@ -926,10 +847,6 @@ func (ctrl *csiSnapshotCommonController) updateGroupSnapshotStatus(groupSnapshot
 			newStatus.Error = volumeSnapshotErr
 			updated = true
 		}
-		if len(newStatus.PVCVolumeSnapshotRefList) == 0 {
-			newStatus.PVCVolumeSnapshotRefList = pvcVolumeSnapshotRefList
-			updated = true
-		}
 	}
 
 	if updated {

pkg/common-controller/groupsnapshot_controller_helper.go

@@ -247,13 +247,9 @@ func (ctrl *csiSnapshotSideCarController) deleteCSIGroupSnapshotOperation(groupS
 	}
 
 	var snapshotIDs []string
-	if groupSnapshotContent.Status != nil && len(groupSnapshotContent.Status.PVVolumeSnapshotContentList) != 0 {
-		for _, contentRef := range groupSnapshotContent.Status.PVVolumeSnapshotContentList {
-			snapshotContent, err := ctrl.contentLister.Get(contentRef.VolumeSnapshotContentRef.Name)
-			if err != nil {
-				return fmt.Errorf("failed to get snapshot content %s from snapshot content store: %v", contentRef.VolumeSnapshotContentRef.Name, err)
-			}
-			snapshotIDs = append(snapshotIDs, *snapshotContent.Status.SnapshotHandle)
+	if groupSnapshotContent.Status != nil && len(groupSnapshotContent.Status.VolumeSnapshotHandlePairList) != 0 {
+		for _, contentRef := range groupSnapshotContent.Status.VolumeSnapshotHandlePairList {
+			snapshotIDs = append(snapshotIDs, contentRef.SnapshotHandle)
 		}
 	}
 
@@ -290,7 +286,6 @@ func (ctrl *csiSnapshotSideCarController) clearGroupSnapshotContentStatus(
 		groupSnapshotContent.Status.ReadyToUse = nil
 		groupSnapshotContent.Status.CreationTime = nil
 		groupSnapshotContent.Status.Error = nil
-		groupSnapshotContent.Status.PVVolumeSnapshotContentList = nil
 	}
 	newContent, err := ctrl.clientset.GroupsnapshotV1alpha1().VolumeGroupSnapshotContents().UpdateStatus(context.TODO(), groupSnapshotContent, metav1.UpdateOptions{})
 	if err != nil {