Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ COPY main.go main.go
COPY api/ api/
COPY controllers/ controllers/
COPY pkg/ pkg/
COPY internal/ internal/

# Build
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
Expand Down
3 changes: 3 additions & 0 deletions controllers/componentversion_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ func (r *ComponentVersionReconciler) Reconcile(ctx context.Context, req ctrl.Req

return ctrl.Result{}, nil
}
defer func() {
_ = octx.Finalize()
}()

// reconcile the version before calling reconcile func
update, version, err := r.checkVersion(ctx, octx, obj)
Expand Down
6 changes: 6 additions & 0 deletions controllers/mutation_reconcile_looper.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,9 @@ func (m *MutationReconcileLooper) fetchDataFromComponentVersion(ctx context.Cont
if err != nil {
return nil, fmt.Errorf("failed to create authenticated client: %w", err)
}
defer func() {
_ = octx.Finalize()
}()

if obj.ResourceRef == nil {
return nil, fmt.Errorf("no resource ref found for %s", key)
Expand Down Expand Up @@ -375,6 +378,9 @@ func (m *MutationReconcileLooper) createSubstitutionRulesForLocalization(
if err != nil {
return nil, fmt.Errorf("failed to create authenticated client: %w", err)
}
defer func() {
_ = octx.Finalize()
}()

compvers, err := m.OCMClient.GetComponentVersion(ctx, octx, cv.GetRepositoryURL(), cv.Spec.Component, cv.Status.ReconciledVersion)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions controllers/resource_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ func (r *ResourceReconciler) reconcile(

return ctrl.Result{}, nil
}
defer func() {
_ = octx.Finalize()
}()

reader, digest, size, err := r.OCMClient.GetResource(ctx, octx, componentVersion, obj.Spec.SourceRef.ResourceRef)
if err != nil {
Expand Down
1 change: 0 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ func main() {
}

ctx := ctrl.SetupSignalHandler()

setupLog.Info("starting manager")
if err := mgr.Start(ctx); err != nil {
setupLog.Error(err, "problem running manager")
Expand Down
8 changes: 3 additions & 5 deletions pkg/snapshot/tar.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,15 @@ func buildTar(artifactPath, sourceDir string) error {
}
f, err := os.Open(p)
if err != nil {
f.Close()

return err
}
if _, err := io.Copy(tw, f); err != nil {
f.Close()
defer f.Close()

if _, err := io.Copy(tw, f); err != nil {
return err
}

return f.Close()
return nil
}); err != nil {
tw.Close()
tf.Close()
Expand Down
Loading