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 retension default values and fix bug #484

Merged
merged 1 commit into from
Mar 2, 2024
Merged

add retension default values and fix bug #484

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
2 changes: 1 addition & 1 deletion charts/whizard/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ maintainers:
email: [email protected]
- name: junot
email: [email protected]
version: 0.10.10
version: 0.10.11
appVersion: "latest"
8 changes: 4 additions & 4 deletions charts/whizard/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,10 @@ service:
# whenDeleted: Retain # must be one of Retain and Delete, to specify whether to delete pvc when statefulset is deleted.
# whenScaled: Retain # must be one of Retain and Delete, to spefify whether to delete pvc when statefulset is scaled down.

retention: {}
# retentionRaw: 60d
# retention5m: 180d
# retention1h: 360d
retention:
retentionRaw: 60d
retention5m: 180d
retention1h: 360d

additionalFlags:
- --block-files-concurrency=20
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/monitoring/resources/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ func ApplyDefaults(service *monitoringv1alpha1.Service) *monitoringv1alpha1.Serv
if service.Spec.QueryTemplateSpec.Replicas == nil {
service.Spec.QueryTemplateSpec.Replicas = &whizardQueryReplicas
}
if service.Spec.QueryFrontendTemplateSpec.Resources.Size() == 0 {
service.Spec.QueryFrontendTemplateSpec.Resources = constants.DefaultWhizardBaseResources
if service.Spec.QueryTemplateSpec.Resources.Size() == 0 {
service.Spec.QueryTemplateSpec.Resources = constants.DefaultWhizardBaseResources
}
if service.Spec.QueryTemplateSpec.Envoy.Image == "" {
service.Spec.QueryTemplateSpec.Envoy.Image = constants.DefaultEnvoyImage
Expand Down Expand Up @@ -139,7 +139,7 @@ func ApplyDefaults(service *monitoringv1alpha1.Service) *monitoringv1alpha1.Serv
service.Spec.StoreTemplateSpec.Replicas = &whizardDefaultReplicas
}
if service.Spec.StoreTemplateSpec.Resources.Size() == 0 {
service.Spec.StoreTemplateSpec.Resources = constants.DefaultWhizardBaseResources
service.Spec.StoreTemplateSpec.Resources = constants.DefaultWhizardLargeResource
}

return service
Expand Down
Loading