Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat): Remove progress bar #3067

Closed
wants to merge 4 commits into from
Closed

(feat): Remove progress bar #3067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eb79d3
(feat): Remove progress bar
schristoff Oct 3, 2024
c273b6a
remove pb
schristoff Oct 3, 2024
582b76b
remove progress bar
schristoff Oct 3, 2024
c0d8fa4
do it right this time
schristoff Oct 4, 2024
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
7 changes: 3 additions & 4 deletions src/internal/packager/images/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/google/go-containerregistry/pkg/crane"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/zarf-dev/zarf/src/config"
"github.com/zarf-dev/zarf/src/pkg/message"
"github.com/zarf-dev/zarf/src/pkg/transform"
"github.com/zarf-dev/zarf/src/types"
)
Expand Down Expand Up @@ -98,7 +97,7 @@ func WithPushAuth(ri types.RegistryInfo) crane.Option {
return WithBasicAuth(ri.PushUsername, ri.PushPassword)
}

func createPushOpts(cfg PushConfig, pb *message.ProgressBar) []crane.Option {
func createPushOpts(cfg PushConfig) []crane.Option {
opts := CommonOpts(cfg.Arch)
opts = append(opts, WithPushAuth(cfg.RegInfo))

Expand All @@ -107,9 +106,9 @@ func createPushOpts(cfg PushConfig, pb *message.ProgressBar) []crane.Option {
// TODO (@WSTARR) This is set to match the TLSHandshakeTimeout to potentially mitigate effects of https://github.com/zarf-dev/zarf/issues/1444
transport.ResponseHeaderTimeout = 10 * time.Second

transportWithProgressBar := helpers.NewTransport(transport, pb)
transportWithoutProgressBar := helpers.NewTransport(transport, nil)
AustinAbro321 marked this conversation as resolved.
Show resolved Hide resolved

opts = append(opts, crane.WithTransport(transportWithProgressBar))
opts = append(opts, crane.WithTransport(transportWithoutProgressBar))

return opts
}
50 changes: 1 addition & 49 deletions src/internal/packager/images/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ package images

import (
"context"
"fmt"
"time"

"github.com/avast/retry-go/v4"
"github.com/defenseunicorns/pkg/helpers/v2"
"github.com/google/go-containerregistry/pkg/crane"
"github.com/google/go-containerregistry/pkg/logs"
v1 "github.com/google/go-containerregistry/pkg/v1"
Expand All @@ -27,24 +25,13 @@ func Push(ctx context.Context, cfg PushConfig) error {
logs.Progress.SetOutput(&message.DebugWriter{})

toPush := map[transform.Image]v1.Image{}
var totalSize int64
// Build an image list from the references
for _, refInfo := range cfg.ImageList {
img, err := utils.LoadOCIImage(cfg.SourceDirectory, refInfo)
if err != nil {
return err
}
toPush[refInfo] = img
imgSize, err := calcImgSize(img)
if err != nil {
return err
}
totalSize += imgSize
}

// If this is not a no checksum image push we will be pushing two images (the second will go faster as it checks the same layers)
if !cfg.NoChecksum {
totalSize = totalSize * 2
}

var (
Expand All @@ -64,10 +51,7 @@ func Push(ctx context.Context, cfg PushConfig) error {
defer tunnel.Close()
}
}

progress := message.NewProgressBar(totalSize, fmt.Sprintf("Pushing %d images", len(toPush)))
defer progress.Close()
pushOptions := createPushOpts(cfg, progress)
pushOptions := createPushOpts(cfg)

pushImage := func(img v1.Image, name string) error {
if tunnel != nil {
Expand All @@ -84,13 +68,6 @@ func Push(ctx context.Context, cfg PushConfig) error {
}
}()
for refInfo, img := range toPush {
refTruncated := helpers.Truncate(refInfo.Reference, 55, true)
progress.Updatef(fmt.Sprintf("Pushing %s", refTruncated))

size, err := calcImgSize(img)
if err != nil {
return err
}

// If this is not a no checksum image push it for use with the Zarf agent
if !cfg.NoChecksum {
Expand All @@ -103,7 +80,6 @@ func Push(ctx context.Context, cfg PushConfig) error {
return err
}

totalSize -= size
}

// To allow for other non-zarf workloads to easily see the images upload a non-checksum version
Expand All @@ -120,9 +96,7 @@ func Push(ctx context.Context, cfg PushConfig) error {
}

pushed = append(pushed, refInfo)
totalSize -= size
}
progress.Successf("Pushed %d images", len(cfg.ImageList))
return nil
}, retry.Context(ctx), retry.Attempts(uint(cfg.Retries)), retry.Delay(500*time.Millisecond))
if err != nil {
Expand All @@ -131,25 +105,3 @@ func Push(ctx context.Context, cfg PushConfig) error {

return nil
}

func calcImgSize(img v1.Image) (int64, error) {
size, err := img.Size()
if err != nil {
return size, err
}

layers, err := img.Layers()
if err != nil {
return size, err
}

for _, layer := range layers {
ls, err := layer.Size()
if err != nil {
return size, err
}
size += ls
}

return size, nil
}
4 changes: 2 additions & 2 deletions src/internal/packager2/mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ func pushImagesToRegistry(ctx context.Context, c *cluster.Cluster, pkgLayout *la
transport.TLSClientConfig.InsecureSkipVerify = config.CommonOptions.InsecureSkipTLSVerify
// TODO (@WSTARR) This is set to match the TLSHandshakeTimeout to potentially mitigate effects of https://github.com/zarf-dev/zarf/issues/1444
transport.ResponseHeaderTimeout = 10 * time.Second
transportWithProgressBar := helpers.NewTransport(transport, nil)
transportWithoutProgressBar := helpers.NewTransport(transport, nil)

pushOptions := []crane.Option{
crane.WithPlatform(&v1.Platform{OS: "linux", Architecture: pkgLayout.Pkg.Build.Architecture}),
crane.WithTransport(transportWithProgressBar),
crane.WithTransport(transportWithoutProgressBar),
crane.WithAuth(authn.FromConfig(authn.AuthConfig{
Username: regInfo.PushUsername,
Password: regInfo.PushPassword,
Expand Down
Loading