Add InitScript restore option into manifest restore (#1388)

Signed-off-by: Anisur Rahman <[email protected]>
kubedb · Jan 30, 2025 · f435670 · f435670
1 parent e37dc98
commit f435670
Show file tree

Hide file tree

Showing 114 changed files with 7,305 additions and 2,010 deletions.
diff --git a/apis/archiver/v1alpha1/mariadbarchiver_types.go b/apis/archiver/v1alpha1/mariadbarchiver_types.go
@@ -21,6 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
+	storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
 )
 
 const (
@@ -72,7 +73,7 @@ type MariaDBArchiverSpec struct {
 	BackupStorage *BackupStorage `json:"backupStorage"`
 	// DeletionPolicy defines the DeletionPolicy for the backup repository
 	// +optional
-	DeletionPolicy *DeletionPolicy `json:"deletionPolicy"`
+	DeletionPolicy *storageapi.BackupConfigDeletionPolicy `json:"deletionPolicy"`
 }
 
 // MariaDBArchiverStatus defines the observed state of MariaDBArchiver

diff --git a/apis/archiver/v1alpha1/mongodbarchiver_types.go b/apis/archiver/v1alpha1/mongodbarchiver_types.go
@@ -21,6 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
+	storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
 )
 
 const (
@@ -72,7 +73,7 @@ type MongoDBArchiverSpec struct {
 	BackupStorage *BackupStorage `json:"backupStorage"`
 	// DeletionPolicy defines the created repository's deletionPolicy
 	// +optional
-	DeletionPolicy *DeletionPolicy `json:"deletionPolicy"`
+	DeletionPolicy *storageapi.BackupConfigDeletionPolicy `json:"deletionPolicy"`
 }
 
 // MongoDBArchiverStatus defines the observed state of MongoDBArchiver

diff --git a/apis/archiver/v1alpha1/mssqlserverarchiver_types.go b/apis/archiver/v1alpha1/mssqlserverarchiver_types.go
@@ -21,6 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
+	storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
 )
 
 const (
@@ -72,7 +73,7 @@ type MSSQLServerArchiverSpec struct {
 	BackupStorage *BackupStorage `json:"backupStorage"`
 	// DeletionPolicy defines the created repository's deletionPolicy
 	// +optional
-	DeletionPolicy *DeletionPolicy `json:"deletionPolicy"`
+	DeletionPolicy *storageapi.BackupConfigDeletionPolicy `json:"deletionPolicy"`
 }
 
 // MSSQLServerArchiverStatus defines the observed state of MSSQLServerArchiver

diff --git a/apis/archiver/v1alpha1/mysqlarchiver_types.go b/apis/archiver/v1alpha1/mysqlarchiver_types.go
@@ -21,6 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
+	storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
 )
 
 const (
@@ -72,7 +73,7 @@ type MySQLArchiverSpec struct {
 	BackupStorage *BackupStorage `json:"backupStorage"`
 	// DeletionPolicy defines the created repository's deletionPolicy
 	// +optional
-	DeletionPolicy *DeletionPolicy `json:"deletionPolicy"`
+	DeletionPolicy *storageapi.BackupConfigDeletionPolicy `json:"deletionPolicy"`
 }
 
 // MySQLArchiverStatus defines the observed state of MySQLArchiver

diff --git a/apis/archiver/v1alpha1/postgresarchiver_types.go b/apis/archiver/v1alpha1/postgresarchiver_types.go
@@ -21,6 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
+	storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
 )
 
 const (
@@ -72,7 +73,7 @@ type PostgresArchiverSpec struct {
 	BackupStorage *BackupStorage `json:"backupStorage"`
 	// DeletionPolicy defines the created repository's deletionPolicy
 	// +optional
-	DeletionPolicy *DeletionPolicy `json:"deletionPolicy"`
+	DeletionPolicy *storageapi.BackupConfigDeletionPolicy `json:"deletionPolicy"`
 }
 
 // PostgresArchiverStatus defines the observed state of PostgresArchiver

diff --git a/apis/archiver/v1alpha1/types.go b/apis/archiver/v1alpha1/types.go
@@ -101,16 +101,6 @@ type BackupStorage struct {
 	SubDir string `json:"subDir,omitempty"`
 }
 
-// +kubebuilder:validation:Enum=Delete;WipeOut;DoNotDelete
-type DeletionPolicy string
-
-const (
-	// Deletes archiver, removes the backup jobs and walg sidecar containers, but keeps the backup data
-	DeletionPolicyDelete DeletionPolicy = "Delete"
-	// Deletes everything including the backup data
-	DeletionPolicyWipeOut DeletionPolicy = "WipeOut"
-)
-
 type SchedulerOptions struct {
 	Schedule string `json:"schedule"`
 	// +optional

diff --git a/apis/archiver/v1alpha1/zz_generated.deepcopy.go b/apis/archiver/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/kubedb/v1/openapi_generated.go b/apis/kubedb/v1/openapi_generated.go
diff --git a/apis/kubedb/v1/types.go b/apis/kubedb/v1/types.go
@@ -252,4 +252,9 @@ type ManifestOptions struct {
 	// ArchiverRef specifies the new name and namespace of the Archiver yaml after restore
 	// +optional
 	ArchiverRef *kmapi.ObjectReference `json:"archiverRef,omitempty"`
+
+	// InitScript specifies whether to restore the InitScript or not
+	// +kubebuilder:default=false
+	// +optional
+	InitScript *bool `json:"initScript,omitempty"`
 }
diff --git a/apis/kubedb/v1/zz_generated.deepcopy.go b/apis/kubedb/v1/zz_generated.deepcopy.go
diff --git a/apis/kubedb/v1alpha2/openapi_generated.go b/apis/kubedb/v1alpha2/openapi_generated.go
diff --git a/apis/kubedb/v1alpha2/types.go b/apis/kubedb/v1alpha2/types.go
@@ -254,6 +254,26 @@ type ArchiverRecovery struct {
 	// FullDBRepository means db restore + manifest restore
 	FullDBRepository    *kmapi.ObjectReference   `json:"fullDBRepository,omitempty"`
 	ReplicationStrategy *PITRReplicationStrategy `json:"replicationStrategy,omitempty"`
+
+	// ManifestOptions provide options to select particular manifest object to restore
+	// +optional
+	ManifestOptions *ManifestOptions `json:"manifestOptions,omitempty"`
+}
+
+type ManifestOptions struct {
+	// Archiver specifies whether to restore the Archiver manifest or not
+	// +kubebuilder:default=false
+	// +optional
+	Archiver *bool `json:"archiver,omitempty"`
+
+	// ArchiverRef specifies the new name and namespace of the Archiver yaml after restore
+	// +optional
+	ArchiverRef *kmapi.ObjectReference `json:"archiverRef,omitempty"`
+
+	// InitScript specifies whether to restore the InitScript or not
+	// +kubebuilder:default=false
+	// +optional
+	InitScript *bool `json:"initScript,omitempty"`
 }
 
 type ArbiterSpec struct {

diff --git a/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/apis/kubedb/v1alpha2/zz_generated.deepcopy.go
diff --git a/crds/archiver.kubedb.com_mariadbarchivers.yaml b/crds/archiver.kubedb.com_mariadbarchivers.yaml
@@ -117,7 +117,7 @@ spec:
                 enum:
                 - Delete
                 - WipeOut
-                - DoNotDelete
+                - Retain
                 type: string
               encryptionSecret:
                 properties:

diff --git a/crds/archiver.kubedb.com_mongodbarchivers.yaml b/crds/archiver.kubedb.com_mongodbarchivers.yaml
@@ -117,7 +117,7 @@ spec:
                 enum:
                 - Delete
                 - WipeOut
-                - DoNotDelete
+                - Retain
                 type: string
               encryptionSecret:
                 properties:

diff --git a/crds/archiver.kubedb.com_mssqlserverarchivers.yaml b/crds/archiver.kubedb.com_mssqlserverarchivers.yaml
@@ -117,7 +117,7 @@ spec:
                 enum:
                 - Delete
                 - WipeOut
-                - DoNotDelete
+                - Retain
                 type: string
               encryptionSecret:
                 properties:

diff --git a/crds/archiver.kubedb.com_mysqlarchivers.yaml b/crds/archiver.kubedb.com_mysqlarchivers.yaml
@@ -117,7 +117,7 @@ spec:
                 enum:
                 - Delete
                 - WipeOut
-                - DoNotDelete
+                - Retain
                 type: string
               encryptionSecret:
                 properties:

diff --git a/crds/archiver.kubedb.com_postgresarchivers.yaml b/crds/archiver.kubedb.com_postgresarchivers.yaml
@@ -117,7 +117,7 @@ spec:
                 enum:
                 - Delete
                 - WipeOut
-                - DoNotDelete
+                - Retain
                 type: string
               encryptionSecret:
                 properties: