Update VolumeSnapshotterStats field (#47)

Signed-off-by: Anisur Rahman <[email protected]>

apis/addons/v1alpha1/addon_types.go

@@ -69,7 +69,7 @@ type Task struct {
 	// Valid values are:
 	// - "Restic": The underlying tool is [restic](https://restic.net/).
 	// - "WalG": The underlying tool is [wal-g](https://github.com/wal-g/wal-g).
-	// +kubebuilder:validation:Enum=Restic;WalG
+	// +kubebuilder:validation:Enum=Restic;WalG;VolumeSnapshotter;
 	Driver apis.Driver `json:"driver,omitempty"`
 
 	// Executor specifies the type of entity that will execute the task. For example, it can be a Job,

apis/core/v1alpha1/restoresession_helpers.go

@@ -53,6 +53,10 @@ func (rs *RestoreSession) CalculatePhase() RestorePhase {
 		return componentsPhase
 	}
 
+	if componentsPhase == RestorePhaseUnknown {
+		return componentsPhase
+	}
+
 	return RestoreRunning
 }
 
@@ -72,6 +76,7 @@ func (rs *RestoreSession) getComponentsPhase() RestorePhase {
 
 	failedComponent := 0
 	successfulComponent := 0
+	unknownComponentPhase := 0
 
 	for _, c := range rs.Status.Components {
 		if c.Phase == RestoreSucceeded {
@@ -80,6 +85,9 @@ func (rs *RestoreSession) getComponentsPhase() RestorePhase {
 		if c.Phase == RestoreFailed {
 			failedComponent++
 		}
+		if c.Phase == RestorePhaseUnknown {
+			unknownComponentPhase++
+		}
 	}
 
 	totalComponents := int(rs.Status.TotalComponents)
@@ -88,8 +96,11 @@ func (rs *RestoreSession) getComponentsPhase() RestorePhase {
 		return RestoreSucceeded
 	}
 
-	if successfulComponent+failedComponent == totalComponents {
-		return RestoreFailed
+	if successfulComponent+failedComponent+unknownComponentPhase == totalComponents {
+		if failedComponent > 0 {
+			return RestoreFailed
+		}
+		return RestorePhaseUnknown
 	}
 
 	return RestoreRunning

apis/core/v1alpha1/restoresession_types.go

@@ -210,15 +210,16 @@ type RestoreSessionStatus struct {
 }
 
 // RestorePhase represents the current state of the restore process
-// +kubebuilder:validation:Enum=Pending;Running;Failed;Succeeded;Invalid
+// +kubebuilder:validation:Enum=Pending;Running;Failed;Succeeded;Invalid;Unknown
 type RestorePhase string
 
 const (
-	RestorePending   RestorePhase = "Pending"
-	RestoreRunning   RestorePhase = "Running"
-	RestoreFailed    RestorePhase = "Failed"
-	RestoreSucceeded RestorePhase = "Succeeded"
-	RestoreInvalid   RestorePhase = "Invalid"
+	RestorePending      RestorePhase = "Pending"
+	RestoreRunning      RestorePhase = "Running"
+	RestoreFailed       RestorePhase = "Failed"
+	RestoreSucceeded    RestorePhase = "Succeeded"
+	RestoreInvalid      RestorePhase = "Invalid"
+	RestorePhaseUnknown RestorePhase = "Unknown"
 )
 
 // ComponentRestoreStatus represents the restore status of individual components

apis/storage/v1alpha1/snapshot_types.go

@@ -198,7 +198,7 @@ type Component struct {
 
 	// VolumeSnapshotterStats specifies the "VolumeSnapshotter" driver specific information
 	// +optional
-	VolumeSnapshotterStats *VolumeSnapshotterStats `json:"volumeSnapshotterStats,omitempty"`
+	VolumeSnapshotterStats []VolumeSnapshotterStats `json:"volumeSnapshotterStats,omitempty"`
 
 	// WalSegments specifies a list of wall segment for individual component
 	WalSegments []WalSegment `json:"walSegments,omitempty"`
@@ -235,6 +235,7 @@ type ResticStats struct {
 
 // VolumeSnapshotterStats specifies the "VolumeSnapshotter" driver specific information
 type VolumeSnapshotterStats struct {
+	PvcName            string `json:"pvcName,omitempty"`
 	VolumeSnapshotName string `json:"volumeSnapshotName,omitempty"`
 }
 

crds/addons.kubestash.com_addons.yaml

@@ -63,6 +63,7 @@ spec:
                       - enum:
                         - Restic
                         - WalG
+                        - VolumeSnapshotter
                       description: 'Driver specifies the underlying tool that will
                         be used to upload the data to the backend storage. Valid values
                         are: - "Restic": The underlying tool is [restic](https://restic.net/).
@@ -2367,6 +2368,7 @@ spec:
                       - enum:
                         - Restic
                         - WalG
+                        - VolumeSnapshotter
                       description: 'Driver specifies the underlying tool that will
                         be used to upload the data to the backend storage. Valid values
                         are: - "Restic": The underlying tool is [restic](https://restic.net/).

crds/core.kubestash.com_restoresessions.yaml

@@ -23294,6 +23294,7 @@ spec:
                       - Failed
                       - Succeeded
                       - Invalid
+                      - Unknown
                       type: string
                   type: object
                 description: Components represents the individual component restore
@@ -23460,6 +23461,7 @@ spec:
                 - Failed
                 - Succeeded
                 - Invalid
+                - Unknown
                 type: string
               targetFound:
                 description: TargetFound specifies whether the restore target exist

crds/storage.kubestash.com_snapshots.yaml

@@ -200,10 +200,16 @@ spec:
                     volumeSnapshotterStats:
                       description: VolumeSnapshotterStats specifies the "VolumeSnapshotter"
                         driver specific information
-                      properties:
-                        volumeSnapshotName:
-                          type: string
-                      type: object
+                      items:
+                        description: VolumeSnapshotterStats specifies the "VolumeSnapshotter"
+                          driver specific information
+                        properties:
+                          pvcName:
+                            type: string
+                          volumeSnapshotName:
+                            type: string
+                        type: object
+                      type: array
                     walSegments:
                       description: WalSegments specifies a list of wall segment for
                         individual component

go.mod

@@ -1,6 +1,6 @@
 module kubestash.dev/apimachinery
 
-go 1.18
+go 1.20
 
 require (
 	github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2