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

Jump to bottom

vendor c/image #17405

Closed
wants to merge 2 commits into from
Closed

vendor c/image #17405

wants to merge 2 commits into from

Conversation

vrothberg
Copy link
Member

To fix the registry flakes we see in #17193 making c/image more tolerant
toward unexpected EOFs from registries.

Fixes: #17193
Signed-off-by: Valentin Rothberg vrothberg@redhat.com

Does this PR introduce a user-facing change?

None

@nalind I had to pin docker/docker as imagebuilder doesn't like the new code:

# github.com/openshift/imagebuilder/dockerfile/parser                                                        
vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go:122:12: undefined: system.LCOWSupported 
vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go:157:12: undefined: system.LCOWSupported

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrothberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 7, 2023
@vrothberg
Copy link
Member Author

@edsantiago PTAL

@vrothberg
network ls: handle removed container
6c8c70c 
Handle a race condition in the REST API when listing networks.
In between listing all containers and inspecting them, they may have
already been removed, so handle this case gracefully.

[NO NEW TESTS NEEDED] as it's a race condition.

Fixes: containers#17341
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
@vrothberg
vendor c/image
8012b9a 
To fix the registry flakes we see in containers#17193 making c/image more tolerant
toward unexpected EOFs from registries.

Also pin docker/docker to v20.10.23+incompatible as it doesn't compile
as imagebuilder needs to be fixed before.

Fixes: containers#17193
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
@github-actions github-actions bot added the kind/api-change Change to remote API; merits scrutiny label Feb 7, 2023
@vrothberg vrothberg added the bloat_approved Approve a PR in which binary file size grows by over 50k label Feb 7, 2023
@vrothberg
Copy link
Member Author

@containers/podman-maintainers PTAL

We can thank @mtrmac afterwards for a greener (CI) future

@edsantiago
Copy link
Member

edsantiago commented Feb 7, 2023 •
edited
Loading

Looks like there was a flake, and someone restarted it. What was the flake? UPDATE: never mind. it was the bloat test failing, and a Cirrus hiccup.

Luap99
Luap99 reviewed Feb 7, 2023
View reviewed changes
pkg/api/handlers/compat/networks.go
Comment on lines +77 to +79
if errors.Is(err, define.ErrNoSuchCtr) || errors.Is(err, define.ErrCtrRemoved) {
continue
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this commit sneaked in, it is already merged so could you please drop it.

go.mod
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
github.com/vbatts/tar-split v0.11.2 // indirect
github.com/vbauerster/mpb/v8 v8.1.6 // indirect
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be good to include #17342 here to reduce bloat.

@mtrmac
Copy link
Collaborator

mtrmac commented Feb 7, 2023

Alternatively, #17221 contains just the one change — but depends on having a discussion about adding it to the stable branch.

@vrothberg
Copy link
Member Author

Alternatively, #17221 contains just the one change — but depends on having a discussion about adding it to the stable branch.

Closing in favor of that.

@vrothberg vrothberg closed this Feb 8, 2023
@mtrmac mtrmac mentioned this pull request Feb 8, 2023
Merged
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 11, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Luap99 Luap99 Luap99 left review comments

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bloat_approved Approve a PR in which binary file size grows by over 50k kind/api-change Change to remote API; merits scrutiny locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

copying system image from manifest list: writing/storing blob: happened during read: unexpected EOF
4 participants
@vrothberg @edsantiago @mtrmac @Luap99