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

Jump to bottom

backup: make LogBackupTemplate optional #5190

Merged
merged 1 commit into from
Jul 21, 2023
Merged

backup: make LogBackupTemplate optional #5190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions docs/api-references/docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,6 @@ BackupSpec
</em>
</td>
<td>
<em>(Optional)</em>
<p>BackupTemplate is the specification of the backup structure to get scheduled.</p>
</td>
</tr>
Expand All @@ -578,6 +577,7 @@ BackupSpec
</em>
</td>
<td>
<em>(Optional)</em>
<p>LogBackupTemplate is the specification of the log backup structure to get scheduled.</p>
</td>
</tr>
Expand Down Expand Up @@ -3631,7 +3631,6 @@ BackupSpec
</em>
</td>
<td>
<em>(Optional)</em>
<p>BackupTemplate is the specification of the backup structure to get scheduled.</p>
</td>
</tr>
Expand All @@ -3645,6 +3644,7 @@ BackupSpec
</em>
</td>
<td>
<em>(Optional)</em>
<p>LogBackupTemplate is the specification of the log backup structure to get scheduled.</p>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion manifests/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4232,7 +4232,7 @@ spec:
storageSize:
type: string
required:
- logBackupTemplate
- backupTemplate
- schedule
type: object
status:
Expand Down
2 changes: 1 addition & 1 deletion manifests/crd/v1/pingcap.com_backupschedules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2705,7 +2705,7 @@ spec:
storageSize:
type: string
required:
- logBackupTemplate
- backupTemplate
- schedule
type: object
status:
Expand Down
2 changes: 1 addition & 1 deletion manifests/crd/v1beta1/pingcap.com_backupschedules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2695,7 +2695,7 @@ spec:
storageSize:
type: string
required:
- logBackupTemplate
- backupTemplate
- schedule
type: object
status:
Expand Down
2 changes: 1 addition & 1 deletion manifests/crd_v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4219,7 +4219,7 @@ spec:
storageSize:
type: string
required:
- logBackupTemplate
- backupTemplate
- schedule
type: object
status:
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/pingcap/v1alpha1/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.

2 changes: 1 addition & 1 deletion pkg/apis/pingcap/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2154,9 +2154,9 @@ type BackupScheduleSpec struct {
// MaxReservedTime is to specify how long backups we want to keep.
MaxReservedTime *string `json:"maxReservedTime,omitempty"`
// BackupTemplate is the specification of the backup structure to get scheduled.
// +optional
BackupTemplate BackupSpec `json:"backupTemplate"`
// LogBackupTemplate is the specification of the log backup structure to get scheduled.
// +optional
LogBackupTemplate *BackupSpec `json:"logBackupTemplate"`
// The storageClassName of the persistent volume for Backup data storage if not storage class name set in BackupSpec.
// Defaults to Kubernetes default storage class.
Expand Down