Make --pitrRestoredTs optional in restore CR (#6135)

Author: RidRisR

docs/api-references/docs.md

@@ -1399,6 +1399,7 @@ string
 </em>
 </td>
 <td>
+<em>(Optional)</em>
 <p>PitrRestoredTs is the pitr restored ts.</p>
 </td>
 </tr>
@@ -15466,6 +15467,7 @@ string
 </em>
 </td>
 <td>
+<em>(Optional)</em>
 <p>PitrRestoredTs is the pitr restored ts.</p>
 </td>
 </tr>

pkg/apis/pingcap/v1alpha1/types.go

@@ -2735,6 +2735,7 @@ type RestoreSpec struct {
 	// +kubebuilder:default=snapshot
 	Mode RestoreMode `json:"restoreMode,omitempty"`
 	// PitrRestoredTs is the pitr restored ts.
+	// +optional
 	PitrRestoredTs string `json:"pitrRestoredTs,omitempty"`
 	// LogRestoreStartTs is the start timestamp which log restore from.
 	// +optional

pkg/backup/restore/restore_manager.go

@@ -768,7 +768,9 @@ func (rm *restoreManager) makeRestoreJob(restore *v1alpha1.Restore) (*batchv1.Jo
 	switch restore.Spec.Mode {
 	case v1alpha1.RestoreModePiTR:
 		args = append(args, fmt.Sprintf("--mode=%s", v1alpha1.RestoreModePiTR))
-		args = append(args, fmt.Sprintf("--pitrRestoredTs=%s", restore.Spec.PitrRestoredTs))
+		if restore.Spec.PitrRestoredTs != "" {
+			args = append(args, fmt.Sprintf("--pitrRestoredTs=%s", restore.Spec.PitrRestoredTs))
+		}
 	case v1alpha1.RestoreModeVolumeSnapshot:
 		args = append(args, fmt.Sprintf("--mode=%s", v1alpha1.RestoreModeVolumeSnapshot))
 		if !v1alpha1.IsRestoreVolumeComplete(restore) {

tests/e2e/br/br.go

@@ -1127,7 +1127,6 @@ var _ = ginkgo.Describe("Backup and Restore", func() {
 			err = createRestoreAndWaitForComplete(f, restoreName, backupClusterName, typ, logBackupName, func(restore *v1alpha1.Restore) {
 				restore.Spec.Mode = v1alpha1.RestoreModePiTR
 				restore.Spec.PitrFullBackupStorageProvider.S3 = fullBackup.Spec.S3
-				restore.Spec.PitrRestoredTs = currentTS
 			})
 			framework.ExpectNoError(err)