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

Retry image stream updates when pruning images #15899

Merged
merged 1 commit into from
Aug 23, 2017
Merged

Retry image stream updates when pruning images #15899

merged 1 commit into from
Aug 23, 2017

Conversation

soltysh
Copy link
Contributor

@soltysh soltysh commented Aug 22, 2017

@mfojtik @brenton ptal, this is a bug fix so I guess we can merge it at any point

@miminar fyi

@soltysh
Copy link
Contributor Author

soltysh commented Aug 22, 2017

/assign @mfojtik

@openshift-merge-robot openshift-merge-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 22, 2017
@soltysh soltysh added component/image and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 22, 2017
@openshift-merge-robot openshift-merge-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 22, 2017
@soltysh soltysh added queue/fix and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 22, 2017
@openshift-merge-robot openshift-merge-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 22, 2017
@soltysh
Copy link
Contributor Author

soltysh commented Aug 22, 2017

@fabianofranz need your sign off as well

@mfojtik
Copy link
Contributor

mfojtik commented Aug 22, 2017

@soltysh the workaround before this fix is basically just re-run the pruning? i'm fine retrying on update conflicts.

/approve no-issue

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 22, 2017
@fabianofranz
Copy link
Member

this is a bug fix so I guess we can merge it at any point

what's the bug or issue?

@soltysh
Copy link
Contributor Author

soltysh commented Aug 23, 2017

what's the bug or issue?

This is part of https://bugzilla.redhat.com/show_bug.cgi?id=1408676 when this error happens:

error updating image stream xzy/qwerty to remove references to image sha256:12345: imagestreams "xyz" cannot be updated: the object has been modified; please apply your changes to the latest version and try again

@soltysh
Copy link
Contributor Author

soltysh commented Aug 23, 2017

Flake #15874
/retest

@fabianofranz
Copy link
Member

@soltysh tks!
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 23, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabianofranz, mfojtik, soltysh

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue

@openshift-merge-robot openshift-merge-robot merged commit df0cb01 into openshift:master Aug 23, 2017
@soltysh soltysh deleted the pruning_retries branch August 29, 2017 13:40
miminar
miminar reviewed Sep 4, 2017
View reviewed changes
pkg/oc/admin/prune/images.go
1. --force-insecure is given
2. provided registry-url is prefixed with http://
3. registry url is a private or link-local address
1. --force-insecure is given
Copy link

Choose a reason for hiding this comment

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

This change breaks formatting. The spaces were there to preserve line breaks. Without them, the lines will be concatenated.

@miminar miminar mentioned this pull request Sep 5, 2017
Merged
openshift-merge-robot added a commit that referenced this pull request Sep 14, 2017
@openshift-merge-robot
Merge pull request #16138 from miminar/origin3.6-secure-image-prune
afb8ebb 
Automatic merge from submit-queue

[3.6][Backport] Prune images (not)securely

Back-porting:
- #14114 
- #14405
- #14914
- #15899

Resolves [bz#1476779](https://bugzilla.redhat.com/show_bug.cgi?id=1476779)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miminar miminar miminar left review comments

Assignees

@mfojtik mfojtik

@fabianofranz fabianofranz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/image lgtm Indicates that a PR is ready to be merged. queue/fix size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@soltysh @mfojtik @fabianofranz @openshift-merge-robot @miminar @openshift-ci-robot