Merge pull request #660 from aryan9600/garbage-retention

Remove leftover timeout in reconcilers
fluxcd · Apr 7, 2022 · 7d84c61 · 7d84c61
2 parents f2ae578 + 72a4982
commit 7d84c61
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
@@ -326,9 +326,6 @@ func (r *HelmChartReconciler) notify(oldObj, newObj *sourcev1.HelmChart, build *
 // they match the Storage server hostname of current runtime.
 func (r *HelmChartReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.HelmChart, build *chart.Build) (sreconcile.Result, error) {
 	// Garbage collect previous advertised artifact(s) from storage
-	// Abort if it takes more than 5 seconds.
-	ctx, cancel := context.WithTimeout(ctx, time.Second*5)
-	defer cancel()
 	_ = r.garbageCollect(ctx, obj)
 
 	// Determine if the advertised artifact is still in storage

diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
@@ -285,9 +285,6 @@ func (r *HelmRepositoryReconciler) notify(oldObj, newObj *sourcev1.HelmRepositor
 // they match the Storage server hostname of current runtime.
 func (r *HelmRepositoryReconciler) reconcileStorage(ctx context.Context, obj *sourcev1.HelmRepository, _ *sourcev1.Artifact, _ *repository.ChartRepository) (sreconcile.Result, error) {
 	// Garbage collect previous advertised artifact(s) from storage
-	// Abort if it takes more than 5 seconds.
-	ctx, cancel := context.WithTimeout(ctx, time.Second*5)
-	defer cancel()
 	_ = r.garbageCollect(ctx, obj)
 
 	// Determine if the advertised artifact is still in storage