Skip to content

Commit

Permalink
add protection and facilitate debugging wrong assets (#2179)
Browse files Browse the repository at this point in the history
There are situations where the tar extraction might fail,
we need to investigate why this happens.

via minio/minio#19510

> Tar file extraction failed for file index: 2, with: EOF
  • Loading branch information
harshavardhana authored Jun 24, 2024
1 parent 6530c91 commit f07d0af
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
10 changes: 7 additions & 3 deletions pkg/controller/artifacts.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ func (c *Controller) getKeychainForTenant(ctx context.Context, ref name.Referenc
// Attempts to fetch given image and then extracts and keeps relevant files
// (minio, minio.sha256sum & minio.minisig) at a pre-defined location (/tmp/webhook/v1/update)
func (c *Controller) fetchArtifacts(tenant *miniov2.Tenant) (latest string, err error) {
c.removeArtifacts() // remove before a fresh fetch.

basePath := updatePath

if err = os.MkdirAll(basePath, 1777); err != nil {
Expand Down Expand Up @@ -166,13 +168,15 @@ func (c *Controller) fetchArtifacts(tenant *miniov2.Tenant) (latest string, err
if err != nil {
return latest, err
}
defer func() {
_ = f.Close()
}()

// Tarball writes a file called image.tar
// This file in turn has each container layer present inside in the form `<layer-hash>.tar.gz`
if err = tarball.Write(ref, img, f); err != nil {
f.Close()
return latest, err
}

if err = f.Close(); err != nil {
return latest, err
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/main-controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -1128,10 +1128,11 @@ func (c *Controller) syncHandler(key string) (Result, error) {
tenantName, images[0], tenant.Spec.Image)

latest, err := c.fetchArtifacts(tenant)
defer c.removeArtifacts()
if err != nil {
// Do not remove assets with errors, keep them for investigation.
return WrapResult(Result{}, err)
}
defer c.removeArtifacts()
updateURL, err := tenant.UpdateURL(latest, fmt.Sprintf("http://operator.%s.svc.%s:%s%s",
miniov2.GetNSFromFile(),
miniov2.GetClusterDomain(),
Expand Down

0 comments on commit f07d0af

Please sign in to comment.