Thanks to visit codestin.com
Credit goes to github.com

Skip to content

server: do not check storage for image name on inspect #5155

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
Merged
openshift-merge-robot merged 1 commit into from
Aug 20, 2021
Merged

server: do not check storage for image name on inspect #5155

openshift-merge-robot merged 1 commit into from
Aug 20, 2021
+3 −15

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Aug 2, 2021

Signed-off-by: Peter Hunt [email protected]

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

none

@openshift-ci openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. labels Aug 2, 2021
@openshift-ci openshift-ci bot requested review from giuseppe and rhatdan August 2, 2021 16:02
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 2, 2021
@haircommander haircommander changed the title server: don't check storage for image name on inspect server: do not check storage for image name on inspect Aug 2, 2021
@codecov
Copy link

codecov bot commented Aug 2, 2021 •
edited
Loading

Codecov Report

Merging #5155 (57e8088) into master (78f06f2) will decrease coverage by 0.37%.
The diff coverage is 100.00%.

❗ Current head 57e8088 differs from pull request most recent head b79ca09. Consider uploading reports for the commit b79ca09 to get more accurate results

@@            Coverage Diff             @@
##           master    #5155      +/-   ##
==========================================
- Coverage   44.27%   43.89%   -0.38%     
==========================================
  Files         112      110       -2     
  Lines       11563    11449     -114     
==========================================
- Hits         5119     5026      -93     
+ Misses       5957     5946      -11     
+ Partials      487      477      -10

@haircommander
Copy link
Member Author

haircommander commented Aug 2, 2021

/retest

2 similar comments
@haircommander
Copy link
Member Author

haircommander commented Aug 2, 2021

/retest

@haircommander
Copy link
Member Author

haircommander commented Aug 2, 2021

/retest

@mrunalp
Copy link
Member

mrunalp commented Aug 2, 2021

@nalind ptal

@TomSweeneyRedHat
Copy link
Contributor

TomSweeneyRedHat commented Aug 2, 2021

LGTM
but cgroupv2 test isn't terribly happy.

saschagrunert
saschagrunert approved these changes Aug 3, 2021
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

LGTM, this should only affect the http info endpoint and not the CRI implementation.

@haircommander haircommander added this to the 1.22 milestone Aug 9, 2021
@haircommander
Copy link
Member Author

haircommander commented Aug 9, 2021

/retest

saschagrunert
saschagrunert approved these changes Aug 10, 2021
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 10, 2021
@openshift-bot
Copy link

openshift-bot commented Aug 10, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

7 similar comments
@openshift-bot
Copy link

openshift-bot commented Aug 10, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 10, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 10, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 10, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 10, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 10, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 10, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 10, 2021
@haircommander
Copy link
Member Author

haircommander commented Aug 10, 2021

I've rebased to make sure this doesn't break e2e, but I'll need the tag back here too @saschagrunert please

@haircommander
Copy link
Member Author

haircommander commented Aug 10, 2021

/retest

1 similar comment
@saschagrunert
Copy link
Member

saschagrunert commented Aug 11, 2021

/retest

mrunalp
mrunalp approved these changes Aug 18, 2021
View reviewed changes
Copy link
Member

@mrunalp mrunalp left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 18, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, mrunalp, saschagrunert

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [haircommander,mrunalp,saschagrunert]

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

@openshift-bot
Copy link

openshift-bot commented Aug 18, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

8 similar comments
@openshift-bot
Copy link

openshift-bot commented Aug 18, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 19, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 19, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 19, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 19, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 19, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 19, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

openshift-bot commented Aug 19, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@haircommander
Copy link
Member Author

haircommander commented Aug 20, 2021

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 20, 2021 •
edited
Loading

@haircommander: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Rerun command
ci/openshift-jenkins/e2e_crun_cgroupv2 b79ca09 link /test e2e_cgroupv2

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@haircommander
Copy link
Member Author

haircommander commented Aug 20, 2021

/retest

@openshift-merge-robot openshift-merge-robot merged commit 2d289a2 into cri-o:master Aug 20, 2021
@mrunalp
Copy link
Member

mrunalp commented Aug 26, 2021

/cherry-pick release-1.21

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 26, 2021
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Aug 26, 2021

@mrunalp: new pull request created: #5253

Details

In response to this:

/cherry-pick release-1.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mrunalp
Copy link
Member

mrunalp commented Aug 26, 2021

/cherry-pick release-1.20

@mrunalp
Copy link
Member

mrunalp commented Aug 26, 2021

/cherry-pick release-1.19

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Aug 26, 2021

@mrunalp: #5155 failed to apply on top of branch "release-1.20":

Applying: server: don't check storage for image name on inspect
Using index info to reconstruct a base tree...
M	server/inspect.go
Falling back to patching base and 3-way merge...
Auto-merging server/inspect.go
CONFLICT (content): Merge conflict in server/inspect.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 server: don't check storage for image name on inspect
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-1.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Aug 26, 2021

@mrunalp: #5155 failed to apply on top of branch "release-1.19":

Applying: server: don't check storage for image name on inspect
Using index info to reconstruct a base tree...
M	server/inspect.go
M	server/inspect_ginkgo_test.go
M	server/inspect_test.go
Falling back to patching base and 3-way merge...
Auto-merging server/inspect_test.go
Auto-merging server/inspect_ginkgo_test.go
Auto-merging server/inspect.go
CONFLICT (content): Merge conflict in server/inspect.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 server: don't check storage for image name on inspect
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-1.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp mrunalp approved these changes

@saschagrunert saschagrunert saschagrunert approved these changes

@runcom runcom Awaiting requested review from runcom

@giuseppe giuseppe Awaiting requested review from giuseppe

@rhatdan rhatdan Awaiting requested review from rhatdan

Assignees

@mrunalp mrunalp

@saschagrunert saschagrunert

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

1.22

Development

Successfully merging this pull request may close these issues.

8 participants

@haircommander @mrunalp @TomSweeneyRedHat @openshift-bot @nalind @saschagrunert @openshift-cherrypick-robot @openshift-merge-robot