Add bypass for validation for older backups, add printcolumns for pre…

…ttier output of MedusaRestoreJob

apis/medusa/v1alpha1/medusarestorejob_types.go

@@ -61,6 +61,9 @@ type MedusaRestoreJobStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Started",type=date,JSONPath=".status.startTime",description="Restore start time"
+//+kubebuilder:printcolumn:name="Finished",type=date,JSONPath=".status.finishTime",description="Restore finish time"
+//+kubebuilder:printcolumn:name="Error",type=string,JSONPath=".status.message",description="Error message"
 
 // MedusaRestoreJob is the Schema for the medusarestorejobs API
 type MedusaRestoreJob struct {

config/crd/bases/medusa.k8ssandra.io_medusarestorejobs.yaml

@@ -14,7 +14,20 @@ spec:
     singular: medusarestorejob
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: Restore start time
+      jsonPath: .status.startTime
+      name: Started
+      type: date
+    - description: Restore finish time
+      jsonPath: .status.finishTime
+      name: Finished
+      type: date
+    - description: Error message
+      jsonPath: .status.message
+      name: Error
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: MedusaRestoreJob is the Schema for the medusarestorejobs API

controllers/medusa/medusarestorejob_controller.go

@@ -275,6 +275,11 @@ func (r *MedusaRestoreJobReconciler) prepareRestore(ctx context.Context, request
 }
 
 func validateBackupForRestore(backup *medusav1alpha1.MedusaBackup, cassdc *cassdcapi.CassandraDatacenter) error {
+	if backup.Status.TotalNodes == 0 && backup.Status.FinishedNodes == 0 {
+		// This is an old backup without enough data, need to skip for backwards compatibility
+		return nil
+	}
+
 	if backup.Status.FinishTime.IsZero() {
 		return fmt.Errorf("target backup has not finished")
 	}