Skip to content

Commit def45c5

Browse files
authored
Merge pull request #747 from fluxcd/fetch-tar-mem
Optimise the memory usage of artifact operations
2 parents 0c7d631 + 5c30abc commit def45c5

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

controllers/kustomization_controller.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,12 @@ func (r *KustomizationReconciler) SetupWithManager(mgr ctrl.Manager, opts Kustom
127127

128128
r.requeueDependency = opts.DependencyRequeueInterval
129129
r.statusManager = fmt.Sprintf("gotk-%s", r.ControllerName)
130-
r.artifactFetcher = fetch.NewArchiveFetcher(opts.HTTPRetry, tar.UnlimitedUntarSize, os.Getenv("SOURCE_CONTROLLER_LOCALHOST"))
130+
r.artifactFetcher = fetch.NewArchiveFetcher(
131+
opts.HTTPRetry,
132+
tar.UnlimitedUntarSize,
133+
tar.UnlimitedUntarSize,
134+
os.Getenv("SOURCE_CONTROLLER_LOCALHOST"),
135+
)
131136

132137
return ctrl.NewControllerManagedBy(mgr).
133138
For(&kustomizev1.Kustomization{}, builder.WithPredicates(

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ require (
2424
github.com/fluxcd/pkg/apis/acl v0.1.0
2525
github.com/fluxcd/pkg/apis/kustomize v0.6.0
2626
github.com/fluxcd/pkg/apis/meta v0.17.0
27-
github.com/fluxcd/pkg/http/fetch v0.1.0
27+
github.com/fluxcd/pkg/http/fetch v0.2.0
2828
github.com/fluxcd/pkg/kustomize v0.8.0
2929
github.com/fluxcd/pkg/runtime v0.22.0
3030
github.com/fluxcd/pkg/ssa v0.21.0
31-
github.com/fluxcd/pkg/tar v0.1.0
31+
github.com/fluxcd/pkg/tar v0.2.0
3232
github.com/fluxcd/pkg/testserver v0.4.0
3333
github.com/fluxcd/source-controller/api v0.30.0
3434
github.com/hashicorp/vault/api v1.8.0

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -290,16 +290,16 @@ github.com/fluxcd/pkg/apis/kustomize v0.6.0 h1:Afxv3Uv+xiuettzqm3sP0ceWikDZTfHdH
290290
github.com/fluxcd/pkg/apis/kustomize v0.6.0/go.mod h1:iY0zSpK6eUiPfNt/yR6g0q/wQP+wH+Ax/L7KBOx5x2M=
291291
github.com/fluxcd/pkg/apis/meta v0.17.0 h1:Y2dfo1syHZDb9Mexjr2SWdcj1FnxnRXm015hEnhl6wU=
292292
github.com/fluxcd/pkg/apis/meta v0.17.0/go.mod h1:GrOVzWXiu22XjLNgLLe2EBYhQPqZetes5SIADb4bmHE=
293-
github.com/fluxcd/pkg/http/fetch v0.1.0 h1:Ig/kZuM0+jHBJnwHn5UUseTKIYD5w8X4bInJyuyOZKI=
294-
github.com/fluxcd/pkg/http/fetch v0.1.0/go.mod h1:1CjOSfn7aOeHf2ZRA2+GTKHg442zN6X/fSys3a0KLC0=
293+
github.com/fluxcd/pkg/http/fetch v0.2.0 h1:Ss2bPfEn1e7OLebzkrU2c2bT1vZWFZmHCjnl0ACsRYM=
294+
github.com/fluxcd/pkg/http/fetch v0.2.0/go.mod h1:60QOWiz4pLe8SPtlHZtVo92qga18qQT2PrbU0D5NWqM=
295295
github.com/fluxcd/pkg/kustomize v0.8.0 h1:8AdEvp6y38ISZzoi0H82Si5zkmLXClbeX10W7HevB00=
296296
github.com/fluxcd/pkg/kustomize v0.8.0/go.mod h1:zGtCZF6V3hMWcf46SqrQc10fS9yUlKzi2UcFUeabDAE=
297297
github.com/fluxcd/pkg/runtime v0.22.0 h1:4YV/An41b+OGdSWDogwFfHr22CEE/in+lBLEK0fr1yc=
298298
github.com/fluxcd/pkg/runtime v0.22.0/go.mod h1:Cm6jIhltzXIM3CRRY6SFASDn+z2m/1yPqOWwD73c3io=
299299
github.com/fluxcd/pkg/ssa v0.21.0 h1:aeoTohPNf5x7jQjHidyLJAOHw3EyHOQoQN3mN2i+4cc=
300300
github.com/fluxcd/pkg/ssa v0.21.0/go.mod h1:jumyhUbEMDnduN7anSlKfxl2fEoyeyv+Ta5hWCbxI5Q=
301-
github.com/fluxcd/pkg/tar v0.1.0 h1:ObyUml8NJtGQtz/cRgexd7HU2mQsTmgjz2dtX4xdnng=
302-
github.com/fluxcd/pkg/tar v0.1.0/go.mod h1:w0/TOC7kwBJhnSJn7TCABkc/I7ib1f2Yz6vOsbLBnhw=
301+
github.com/fluxcd/pkg/tar v0.2.0 h1:HEUHgONQYsJGeZZ4x6h5nQU9Aox1I4T3bOp1faWTqf8=
302+
github.com/fluxcd/pkg/tar v0.2.0/go.mod h1:w0/TOC7kwBJhnSJn7TCABkc/I7ib1f2Yz6vOsbLBnhw=
303303
github.com/fluxcd/pkg/testserver v0.4.0 h1:pDZ3gistqYhwlf3sAjn1Q8NzN4Qe6I1BEmHMHi46lMg=
304304
github.com/fluxcd/pkg/testserver v0.4.0/go.mod h1:gjOKX41okmrGYOa4oOF2fiLedDAfPo1XaG/EzrUUGBI=
305305
github.com/fluxcd/source-controller/api v0.30.0 h1:rPVPpwXcYG2n0DTRcRagfGDiccvCib5S09K5iMjlpRU=

0 commit comments

Comments
 (0)