Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add InitScript restore option into manifest restore #1388

Merged
merged 3 commits into from
Jan 30, 2025
Merged

Add InitScript restore option into manifest restore #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3231eae
Add InitScript restore option into manifest restore
anisurrahman75 Jan 29, 2025
14a70b6
Merge branch 'master' into init-script-false
anisurrahman75 Jan 30, 2025
8ed728e
rename vaalpha1 to storageapi
anisurrahman75 Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apis/archiver/v1alpha1/mariadbarchiver_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion apis/archiver/v1alpha1/mongodbarchiver_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion apis/archiver/v1alpha1/mssqlserverarchiver_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion apis/archiver/v1alpha1/mysqlarchiver_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion apis/archiver/v1alpha1/postgresarchiver_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions apis/archiver/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions apis/archiver/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions apis/kubedb/v1/openapi_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions apis/kubedb/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
5 changes: 5 additions & 0 deletions apis/kubedb/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 42 additions & 1 deletion apis/kubedb/v1alpha2/openapi_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions apis/kubedb/v1alpha2/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
36 changes: 36 additions & 0 deletions apis/kubedb/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crds/archiver.kubedb.com_mariadbarchivers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
enum:
- Delete
- WipeOut
- DoNotDelete
- Retain
type: string
encryptionSecret:
properties:
Expand Down
2 changes: 1 addition & 1 deletion crds/archiver.kubedb.com_mongodbarchivers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
enum:
- Delete
- WipeOut
- DoNotDelete
- Retain
type: string
encryptionSecret:
properties:
Expand Down
2 changes: 1 addition & 1 deletion crds/archiver.kubedb.com_mssqlserverarchivers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
enum:
- Delete
- WipeOut
- DoNotDelete
- Retain
type: string
encryptionSecret:
properties:
Expand Down
2 changes: 1 addition & 1 deletion crds/archiver.kubedb.com_mysqlarchivers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
enum:
- Delete
- WipeOut
- DoNotDelete
- Retain
type: string
encryptionSecret:
properties:
Expand Down
2 changes: 1 addition & 1 deletion crds/archiver.kubedb.com_postgresarchivers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
enum:
- Delete
- WipeOut
- DoNotDelete
- Retain
type: string
encryptionSecret:
properties:
Expand Down
Loading
Loading