Skip to content

Add maximumBackupCount and blobQuota configuration surface to the installer #9227

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

Merged
merged 2 commits into from
Apr 12, 2022
Merged

Add maximumBackupCount and blobQuota configuration surface to the installer #9227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf35f3
Allow `maximumBackupCount` to be configured
Apr 11, 2022
1d78bcd
Allow `blobQuota` to be configured
Apr 11, 2022
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
10 changes: 9 additions & 1 deletion install/installer/pkg/common/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,19 @@ func useMinio(context *RenderContext) bool {
func StorageConfig(context *RenderContext) storageconfig.StorageConfig {
var res *storageconfig.StorageConfig
if context.Config.ObjectStorage.CloudStorage != nil {
maximumBackupCount := 3
if context.Config.ObjectStorage.MaximumBackupCount != nil {
maximumBackupCount = *context.Config.ObjectStorage.MaximumBackupCount
}

res = &storageconfig.StorageConfig{
Kind: storageconfig.GCloudStorage,
GCloudConfig: storageconfig.GCPConfig{
Region: context.Config.Metadata.Region,
Project: context.Config.ObjectStorage.CloudStorage.Project,
CredentialsFile: filepath.Join(storageMount, "service-account.json"),
ParallelUpload: 6,
MaximumBackupCount: 3,
MaximumBackupCount: maximumBackupCount,
},
}
}
Expand Down Expand Up @@ -88,6 +93,9 @@ func StorageConfig(context *RenderContext) storageconfig.StorageConfig {
}
// 5 GiB
res.BlobQuota = 5 * 1024 * 1024 * 1024
if context.Config.ObjectStorage.BlobQuota != nil {
res.BlobQuota = *context.Config.ObjectStorage.BlobQuota
}

_ = context.WithExperimental(func(ucfg *experimental.Config) error {
if ucfg.Workspace != nil {
Expand Down
10 changes: 6 additions & 4 deletions install/installer/pkg/config/v1/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,12 @@ type DatabaseCloudSQL struct {
}

type ObjectStorage struct {
InCluster *bool `json:"inCluster,omitempty"`
S3 *ObjectStorageS3 `json:"s3,omitempty"`
CloudStorage *ObjectStorageCloudStorage `json:"cloudStorage,omitempty"`
Azure *ObjectStorageAzure `json:"azure,omitempty"`
InCluster *bool `json:"inCluster,omitempty"`
S3 *ObjectStorageS3 `json:"s3,omitempty"`
CloudStorage *ObjectStorageCloudStorage `json:"cloudStorage,omitempty"`
Azure *ObjectStorageAzure `json:"azure,omitempty"`
MaximumBackupCount *int `json:"maximumBackupCount,omitempty"`
BlobQuota *int64 `json:"blobQuota,omitempty"`
}

type ObjectStorageS3 struct {
Expand Down