From bc387ca3fd7bd5b0cc572cfd5c04e10edf00a1dd Mon Sep 17 00:00:00 2001 From: Rao Yunkun Date: Tue, 20 Apr 2021 12:10:41 +0800 Subject: [PATCH] Add metering default config. Signed-off-by: Rao Yunkun --- pkg/kapis/monitoring/v1alpha3/handler.go | 2 +- pkg/kapis/tenant/v1alpha2/handler.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kapis/monitoring/v1alpha3/handler.go b/pkg/kapis/monitoring/v1alpha3/handler.go index e7a7c1c40..dc8bf30f1 100644 --- a/pkg/kapis/monitoring/v1alpha3/handler.go +++ b/pkg/kapis/monitoring/v1alpha3/handler.go @@ -49,7 +49,7 @@ func NewHandler(k kubernetes.Interface, monitoringClient monitoring.Interface, m if ksClient != nil { opRelease = openpitrix.NewOpenpitrixOperator(f, ksClient, nil) } - if meteringOptions == nil { + if meteringOptions == nil || meteringOptions.RetentionDay == "" { meteringOptions = &meteringclient.DefaultMeteringOption } diff --git a/pkg/kapis/tenant/v1alpha2/handler.go b/pkg/kapis/tenant/v1alpha2/handler.go index 540402abd..9c132ebfb 100644 --- a/pkg/kapis/tenant/v1alpha2/handler.go +++ b/pkg/kapis/tenant/v1alpha2/handler.go @@ -61,7 +61,7 @@ func newTenantHandler(factory informers.InformerFactory, k8sclient kubernetes.In monitoringclient monitoringclient.Interface, resourceGetter *resourcev1alpha3.ResourceGetter, meteringOptions *meteringclient.Options) *tenantHandler { - if meteringOptions == nil { + if meteringOptions == nil || meteringOptions.RetentionDay == "" { meteringOptions = &meteringclient.DefaultMeteringOption }