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.

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

[2.0] vendor c/image v5.5.2 #7356

Merged
merged 1 commit into from
Aug 20, 2020

Conversation

vrothberg
Copy link
Member

Enable pagination until the search result reaches the limit, instead of
returning default 100 limit from registry API.

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1866153
Signed-off-by: Valentin Rothberg [email protected]

@openshift-ci-robot
Copy link
Collaborator

[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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2020
@vrothberg
Copy link
Member Author

@baude @mheon @QiWang19 PTAL

@mheon
Copy link
Member

mheon commented Aug 18, 2020

LGTM

1 similar comment
@QiWang19
Copy link
Contributor

LGTM

@TomSweeneyRedHat
Copy link
Member

LGTM
May have missed the PR in my disaster of an inbox, but is this going into upstream too?

@QiWang19
Copy link
Contributor

Do we need to remove the CLI check in this PR? Or I can open a PR after this vendor PR gets merged.

if searchOptions.Limit > 100 {
return errors.Errorf("Limit %d is outside the range of [1, 100]", searchOptions.Limit)
}

@mheon
Copy link
Member

mheon commented Aug 18, 2020

This needs a rebase on latest master, I think.

@mheon
Copy link
Member

mheon commented Aug 18, 2020

Ah, wait, this is against 2.0 - interesting.

@mheon
Copy link
Member

mheon commented Aug 18, 2020

Hm.
[+0868s] Error: container_linux.go:349: starting container process caused "error adding seccomp rule for syscall socket: requested action matches default action of filter": OCI runtime error

Exclusively on runc... I think we solved this with a runc bump on master?

@rhatdan
Copy link
Member

rhatdan commented Aug 18, 2020

Yup I am seeing the same failure on my v2.0 tests.

@cevich PTAL

@vrothberg
Copy link
Member Author

Do we need to remove the CLI check in this PR? Or I can open a PR after this vendor PR gets merged.

if searchOptions.Limit > 100 {
return errors.Errorf("Limit %d is outside the range of [1, 100]", searchOptions.Limit)
}

Good catch, @QiWang19! I blindly vendored but can fix it here directly 👍

@cevich
Copy link
Member

cevich commented Aug 19, 2020

Yup I am seeing the same failure on my v2.0 tests.
@cevich PTAL

Yep, I'm on it. I think #7365 might fix this, but it's just a guess. I don't think anyone is aware of the actual underlying cause, but I was told it only affects Ubuntu VMs, Bent tried replacing runc, and so the other main difference is an older golang version (on this branch). If that doesn't work out...sheesh, I dunno where to turn next 😕

Enable pagination until the search result reaches the limit, instead of
returning default 100 limit from registry API.

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1866153
Signed-off-by: Valentin Rothberg <[email protected]>
@vrothberg
Copy link
Member Author

Rebased on @baude's fixes. Thanks!

@rhatdan
Copy link
Member

rhatdan commented Aug 20, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 20, 2020
@openshift-merge-robot openshift-merge-robot merged commit 386de7a into containers:v2.0 Aug 20, 2020
@vrothberg vrothberg deleted the 2.0-vendor-image branch August 20, 2020 12:04
@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 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants