feat: add retries to image push #3718
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Austin Abro <[email protected]>
✅ Deploy Preview for zarf-docs canceled.
|
Signed-off-by: Austin Abro <[email protected]>
Codecov ReportAttention: Patch coverage is
🚀 New features to boost your workflow:
|
Signed-off-by: Austin Abro <[email protected]>
Signed-off-by: Austin Abro <[email protected]>
Signed-off-by: Austin Abro <[email protected]>
mkcp
approved these changes
Apr 22, 2025
| // Push pushes images to a registry. | ||
| func Push(ctx context.Context, cfg PushConfig) error { | ||
| if cfg.Retries < 1 { |
|
|
||
| if err = pushImage(img.Reference, offlineNameCRC); err != nil { | ||
| return err | ||
| pushImage := func(srcName, dstName string) error { |
There was a problem hiding this comment.
Declaring this as a private package func is also a valid approach, and a good way to test how portable logic in your function is (e.g. how easy it is to change should requirements change in the future). However, the params get much more complicated without using the parent func's scope, so this feels like a reasonable tradeoff here. IMO this is about the upper limit of how complex a locally scoped function variable should be.
Comment on lines
+134
to
+137
| if err = pushImage(img, offlineName); err != nil { | ||
| return err | ||
| } | ||
| pushed = append(pushed, img) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
In #3559 we moved from Crane to ORAS. As part of that move, the retry logic was removed on image push. ORAS does have builtin retries but these do not account for failures on the port-forward. For example, an HPA may spin down the Zarf registry and break, these situations can only be saved by retrying and creating another tunnel. By adding back in retries at the Zarf level, we can account for these situations.
To manually test a pod failure, I restarted the Zarf registry mid push. I verified that I got a failure doing this on current Zarf, and verified that this will recover when trying with the change in this PR
Checklist before merging