Merge pull request #1235 from leonardoce/metatime

Change CreationTime in VolumeGroupSnapshotContentStatus from *int64 to *metav1.Time

Author: k8s-ci-robot

client/apis/volumegroupsnapshot/v1beta1/types.go

@@ -327,7 +327,7 @@ type VolumeGroupSnapshotContentStatus struct {
 	// since 1970-01-01 00:00:00 UTC.
 	// This field is the source for the CreationTime field in VolumeGroupSnapshotStatus
 	// +optional
-	CreationTime *int64 `json:"creationTime,omitempty" protobuf:"varint,2,opt,name=creationTime"`
+	CreationTime *metav1.Time `json:"creationTime,omitempty" protobuf:"bytes,2,opt,name=creationTime"`
 
 	// ReadyToUse indicates if all the individual snapshots in the group are ready to be
 	// used to restore a group of volumes.

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

@@ -256,8 +256,8 @@ spec:
                   On Unix, the command date +%s%N returns the current time in nanoseconds
                   since 1970-01-01 00:00:00 UTC.
                   This field is the source for the CreationTime field in VolumeGroupSnapshotStatus
-                format: int64
-                type: integer
+                format: date-time
+                type: string
               error:
                 description: |-
                   Error is the last observed error during group snapshot creation, if any.

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

@@ -1280,7 +1280,7 @@ func newContent(contentName, boundToSnapshotUID, boundToSnapshotName, snapshotHa
 }
 
 func newGroupSnapshotContent(groupSnapshotContentName, boundToGroupSnapshotUID, boundToGroupSnapshotName, groupSnapshotHandle, groupSnapshotClassName string, desiredVolumeHandles []string, targetVolumeGroupSnapshotHandle string,
-	deletionPolicy crdv1.DeletionPolicy, creationTime *int64,
+	deletionPolicy crdv1.DeletionPolicy, creationTime *metav1.Time,
 	withFinalizer bool, withStatus bool) *crdv1beta1.VolumeGroupSnapshotContent {
 	ready := true
 	content := crdv1beta1.VolumeGroupSnapshotContent{
@@ -1337,7 +1337,7 @@ func newGroupSnapshotContent(groupSnapshotContentName, boundToGroupSnapshotUID,
 }
 
 func newGroupSnapshotContentArray(groupSnapshotContentName, boundToGroupSnapshotUID, boundToGroupSnapshotSnapshotName, groupSnapshotHandle, groupSnapshotClassName string, desiredVolumeHandles []string, volumeGroupHandle string,
-	deletionPolicy crdv1.DeletionPolicy, creationTime *int64,
+	deletionPolicy crdv1.DeletionPolicy, creationTime *metav1.Time,
 	withFinalizer bool, withStatus bool) []*crdv1beta1.VolumeGroupSnapshotContent {
 	return []*crdv1beta1.VolumeGroupSnapshotContent{
 		newGroupSnapshotContent(groupSnapshotContentName, boundToGroupSnapshotUID, boundToGroupSnapshotSnapshotName, groupSnapshotHandle, groupSnapshotClassName, desiredVolumeHandles, volumeGroupHandle,

pkg/common-controller/framework_test.go

@@ -832,8 +832,7 @@ func (ctrl *csiSnapshotCommonController) updateGroupSnapshotStatus(groupSnapshot
 	boundContentName := groupSnapshotContent.Name
 	var createdAt *time.Time
 	if groupSnapshotContent.Status != nil && groupSnapshotContent.Status.CreationTime != nil {
-		unixTime := time.Unix(0, *groupSnapshotContent.Status.CreationTime)
-		createdAt = &unixTime
+		createdAt = &groupSnapshotContent.Status.CreationTime.DeepCopy().Time
 	}
 	var readyToUse bool
 	if groupSnapshotContent.Status != nil && groupSnapshotContent.Status.ReadyToUse != nil {

pkg/common-controller/groupsnapshot_controller_helper.go

@@ -443,7 +443,7 @@ func (ctrl *csiSnapshotSideCarController) createGroupSnapshotWrapper(groupSnapsh
 		})
 	}
 
-	newGroupSnapshotContent, err := ctrl.updateGroupSnapshotContentStatus(groupSnapshotContent, groupSnapshotID, readyToUse, creationTime.UnixNano(), snapshotContentLinks)
+	newGroupSnapshotContent, err := ctrl.updateGroupSnapshotContentStatus(groupSnapshotContent, groupSnapshotID, readyToUse, metav1.NewTime(creationTime), snapshotContentLinks)
 	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)
@@ -578,7 +578,7 @@ func (ctrl *csiSnapshotSideCarController) updateGroupSnapshotContentStatus(
 	groupSnapshotContent *crdv1beta1.VolumeGroupSnapshotContent,
 	groupSnapshotHandle string,
 	readyToUse bool,
-	createdAt int64,
+	createdAt metav1.Time,
 	snapshotContentLinks []snapshotContentNameVolumeHandlePair,
 ) (*crdv1beta1.VolumeGroupSnapshotContent, error) {
 	klog.V(5).Infof("updateGroupSnapshotContentStatus: updating VolumeGroupSnapshotContent [%s], groupSnapshotHandle %s, readyToUse %v, createdAt %v", groupSnapshotContent.Name, groupSnapshotHandle, readyToUse, createdAt)
@@ -789,7 +789,7 @@ func (ctrl *csiSnapshotSideCarController) checkandUpdateGroupSnapshotContentStat
 		}
 
 		// TODO: Get a reference to snapshot contents for this volume group snapshot
-		updatedContent, err := ctrl.updateGroupSnapshotContentStatus(groupSnapshotContent, groupSnapshotID, readyToUse, creationTime.UnixNano(), []snapshotContentNameVolumeHandlePair{})
+		updatedContent, err := ctrl.updateGroupSnapshotContentStatus(groupSnapshotContent, groupSnapshotID, readyToUse, metav1.NewTime(creationTime), []snapshotContentNameVolumeHandlePair{})
 		if err != nil {
 			return groupSnapshotContent, err
 		}