From db553ddc8a0307b0880a8450a43b769cf0176b0f Mon Sep 17 00:00:00 2001 From: Sashank Agarwal Date: Fri, 28 Jan 2022 14:02:04 +0530 Subject: [PATCH] fix cronjob deletion when delete by query is enabled --- internal/indexmanagement/reconcile.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/indexmanagement/reconcile.go b/internal/indexmanagement/reconcile.go index 114da77ba..a347866d5 100644 --- a/internal/indexmanagement/reconcile.go +++ b/internal/indexmanagement/reconcile.go @@ -232,6 +232,7 @@ func (imr *IndexManagementRequest) removeCronJobsForMappings(mappings []apis.Ind expected := sets.NewString() for _, mapping := range mappings { expected.Insert(fmt.Sprintf("%s-im-%s", imr.cluster.Name, mapping.Name)) + expected.Insert(fmt.Sprintf("%s-im-prune-%s", imr.cluster.Name, mapping.Name)) } cronList, err := cronjob.List(context.TODO(), imr.client, imr.cluster.Namespace, imLabels) @@ -363,7 +364,7 @@ func (imr *IndexManagementRequest) reconcileIndexManagementCronjob(policy apis.I corev1.EnvVar{Name: "NAMESPACE_SPECS", Value: namespaceSpecsString}, ) - metrics.SetIndexRetentionDocumentAge(true, mapping.Name, minAgeMillis / millisPerSecond) + metrics.SetIndexRetentionDocumentAge(true, mapping.Name, minAgeMillis/millisPerSecond) metrics.SetIndexRetentionDeleteNamespaceMetrics(mapping.Name, namespaceCount) } else { log.V(1).Info("Skipping curation management for policymapping; delete phase not defined", "policymapping", mapping.Name) @@ -384,7 +385,7 @@ func (imr *IndexManagementRequest) reconcileIndexManagementCronjob(policy apis.I if policy.Phases.Hot.Actions.Rollover != nil { maxAgeMillis, _ := calculateMillisForTimeUnit(policy.Phases.Hot.Actions.Rollover.MaxAge) - metrics.SetIndexRetentionDocumentAge(false, mapping.Name, maxAgeMillis / millisPerSecond) + metrics.SetIndexRetentionDocumentAge(false, mapping.Name, maxAgeMillis/millisPerSecond) } } else { log.V(1).Info("Skipping rollover management for policymapping; hot phase not defined", "policymapping", mapping.Name)