From 5c30abcb0de123f5c2db43ea0005d838d0296168 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Wed, 19 Oct 2022 19:10:17 +0300 Subject: [PATCH] Optimise memory usage of artifact operations - update fluxcd/pkg/tar to v0.2.0 (https://github.com/fluxcd/pkg/pull/377) - update fluxcd/pkg/http/fetch to v0.2.0 (https://github.com/fluxcd/pkg/pull/378) Signed-off-by: Stefan Prodan --- controllers/kustomization_controller.go | 7 ++++++- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/controllers/kustomization_controller.go b/controllers/kustomization_controller.go index 8232cd32..6baa817e 100644 --- a/controllers/kustomization_controller.go +++ b/controllers/kustomization_controller.go @@ -127,7 +127,12 @@ func (r *KustomizationReconciler) SetupWithManager(mgr ctrl.Manager, opts Kustom r.requeueDependency = opts.DependencyRequeueInterval r.statusManager = fmt.Sprintf("gotk-%s", r.ControllerName) - r.artifactFetcher = fetch.NewArchiveFetcher(opts.HTTPRetry, tar.UnlimitedUntarSize, os.Getenv("SOURCE_CONTROLLER_LOCALHOST")) + r.artifactFetcher = fetch.NewArchiveFetcher( + opts.HTTPRetry, + tar.UnlimitedUntarSize, + tar.UnlimitedUntarSize, + os.Getenv("SOURCE_CONTROLLER_LOCALHOST"), + ) return ctrl.NewControllerManagedBy(mgr). For(&kustomizev1.Kustomization{}, builder.WithPredicates( diff --git a/go.mod b/go.mod index e1a043cb..47dcaffb 100644 --- a/go.mod +++ b/go.mod @@ -24,11 +24,11 @@ require ( github.com/fluxcd/pkg/apis/acl v0.1.0 github.com/fluxcd/pkg/apis/kustomize v0.6.0 github.com/fluxcd/pkg/apis/meta v0.17.0 - github.com/fluxcd/pkg/http/fetch v0.1.0 + github.com/fluxcd/pkg/http/fetch v0.2.0 github.com/fluxcd/pkg/kustomize v0.8.0 github.com/fluxcd/pkg/runtime v0.22.0 github.com/fluxcd/pkg/ssa v0.21.0 - github.com/fluxcd/pkg/tar v0.1.0 + github.com/fluxcd/pkg/tar v0.2.0 github.com/fluxcd/pkg/testserver v0.4.0 github.com/fluxcd/source-controller/api v0.30.0 github.com/hashicorp/vault/api v1.8.0 diff --git a/go.sum b/go.sum index 34fa1d93..9cddcaa1 100644 --- a/go.sum +++ b/go.sum @@ -290,16 +290,16 @@ github.com/fluxcd/pkg/apis/kustomize v0.6.0 h1:Afxv3Uv+xiuettzqm3sP0ceWikDZTfHdH github.com/fluxcd/pkg/apis/kustomize v0.6.0/go.mod h1:iY0zSpK6eUiPfNt/yR6g0q/wQP+wH+Ax/L7KBOx5x2M= github.com/fluxcd/pkg/apis/meta v0.17.0 h1:Y2dfo1syHZDb9Mexjr2SWdcj1FnxnRXm015hEnhl6wU= github.com/fluxcd/pkg/apis/meta v0.17.0/go.mod h1:GrOVzWXiu22XjLNgLLe2EBYhQPqZetes5SIADb4bmHE= -github.com/fluxcd/pkg/http/fetch v0.1.0 h1:Ig/kZuM0+jHBJnwHn5UUseTKIYD5w8X4bInJyuyOZKI= -github.com/fluxcd/pkg/http/fetch v0.1.0/go.mod h1:1CjOSfn7aOeHf2ZRA2+GTKHg442zN6X/fSys3a0KLC0= +github.com/fluxcd/pkg/http/fetch v0.2.0 h1:Ss2bPfEn1e7OLebzkrU2c2bT1vZWFZmHCjnl0ACsRYM= +github.com/fluxcd/pkg/http/fetch v0.2.0/go.mod h1:60QOWiz4pLe8SPtlHZtVo92qga18qQT2PrbU0D5NWqM= github.com/fluxcd/pkg/kustomize v0.8.0 h1:8AdEvp6y38ISZzoi0H82Si5zkmLXClbeX10W7HevB00= github.com/fluxcd/pkg/kustomize v0.8.0/go.mod h1:zGtCZF6V3hMWcf46SqrQc10fS9yUlKzi2UcFUeabDAE= github.com/fluxcd/pkg/runtime v0.22.0 h1:4YV/An41b+OGdSWDogwFfHr22CEE/in+lBLEK0fr1yc= github.com/fluxcd/pkg/runtime v0.22.0/go.mod h1:Cm6jIhltzXIM3CRRY6SFASDn+z2m/1yPqOWwD73c3io= github.com/fluxcd/pkg/ssa v0.21.0 h1:aeoTohPNf5x7jQjHidyLJAOHw3EyHOQoQN3mN2i+4cc= github.com/fluxcd/pkg/ssa v0.21.0/go.mod h1:jumyhUbEMDnduN7anSlKfxl2fEoyeyv+Ta5hWCbxI5Q= -github.com/fluxcd/pkg/tar v0.1.0 h1:ObyUml8NJtGQtz/cRgexd7HU2mQsTmgjz2dtX4xdnng= -github.com/fluxcd/pkg/tar v0.1.0/go.mod h1:w0/TOC7kwBJhnSJn7TCABkc/I7ib1f2Yz6vOsbLBnhw= +github.com/fluxcd/pkg/tar v0.2.0 h1:HEUHgONQYsJGeZZ4x6h5nQU9Aox1I4T3bOp1faWTqf8= +github.com/fluxcd/pkg/tar v0.2.0/go.mod h1:w0/TOC7kwBJhnSJn7TCABkc/I7ib1f2Yz6vOsbLBnhw= github.com/fluxcd/pkg/testserver v0.4.0 h1:pDZ3gistqYhwlf3sAjn1Q8NzN4Qe6I1BEmHMHi46lMg= github.com/fluxcd/pkg/testserver v0.4.0/go.mod h1:gjOKX41okmrGYOa4oOF2fiLedDAfPo1XaG/EzrUUGBI= github.com/fluxcd/source-controller/api v0.30.0 h1:rPVPpwXcYG2n0DTRcRagfGDiccvCib5S09K5iMjlpRU=