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

[release-4.5] Bug 1845588: fix(images): use docker/podman create and cp for exec unpacking #400

Merged
merged 3 commits into from
Sep 18, 2020
Merged

[release-4.5] Bug 1845588: fix(images): use docker/podman create and cp for exec unpacking #400

merged 3 commits into from
Sep 18, 2020
+216 −612

Conversation

njhale
Copy link
Member

@njhale njhale commented Jul 23, 2020

Manual cherry-pick of interdependent fixes #351 and #390

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: njhale

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
Copy link

@njhale: This pull request references Bugzilla bug 1845588, which is invalid:

  • expected dependent Bugzilla bug 1860124 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ASSIGNED instead
  • expected dependent Bugzilla bug 1860124 to target a release in 4.6.0, 4.6.z, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

[release-4.5] Bug 1845588: fix(images): use docker/podman create and cp for exec unpacking

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-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Jul 23, 2020
@openshift-ci-robot openshift-ci-robot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 23, 2020
@njhale njhale mentioned this pull request Jul 23, 2020
Closed
@njhale
Copy link
Member Author

njhale commented Jul 23, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link

@njhale: This pull request references Bugzilla bug 1845588, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.z) matches configured target release for branch (4.5.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1841178 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1841178 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
  • bug has dependents

In response to this:

/bugzilla refresh

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-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 23, 2020
@kevinrizza
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2020
@shawn-hurley
Copy link
Member

/hold

I think we need to determine if this is the fix we want to make

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 3, 2020
@njhale
Copy link
Member Author

njhale commented Sep 3, 2020 •
edited
Loading

/hold

I think we need to determine if this is the fix we want to make

@shawn-hurley could you elaborate a little on why we wouldn't want to backport this fix? alternatives?

(I figure there might be some discussion I missed or maybe some connection to our version skew discussions that I'm not making)

@njhale
fix(images): use docker/podman create and cp for exec unpacking

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
4580af0 
Use docker/podman create and cp commands to unpack bundle and index
images instead of a custom unpacking scheme. This fixes an issue where
whiteout files present in an image cause `opm alpha bundle validate` to
fail.
@njhale
fix(validate): pull bundle images before unpacking

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
176a662 
Pull bundle images before attempting to unpack in the bundle validator.
Prevents validation from erroneously failing with "image not found".
@njhale
fix(containerd): always [also] pull layers from linux/amd64

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
1163573 
Ensure linux/amd64 image layers are always pulled after layers for the
default platform. This makes bundle images built for linux
pullable on macos and windows.
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 4, 2020
@njhale
Copy link
Member Author

njhale commented Sep 4, 2020

/hold cancel

@shawn-hurley, following up on our Slack discussion, I've removed the unintentional inclusion of the none container tool option from this patch. Nice catch!

PTAL

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 4, 2020
@kevinrizza
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 4, 2020
@eparis
Copy link

eparis commented Sep 11, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link

@eparis: This pull request references Bugzilla bug 1845588, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.z) matches configured target release for branch (4.5.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1841178 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1841178 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
  • bug has dependents

In response to this:

/bugzilla refresh

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.

@eparis eparis added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 11, 2020
@eparis eparis removed the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 14, 2020
@eparis
Copy link

eparis commented Sep 14, 2020

not sure what happened to tide over teh weekend, but this didn't merge, so pulling the label

@markmc markmc added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 17, 2020
@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 7416454 into operator-framework:release-4.5 Sep 18, 2020
@openshift-ci-robot
Copy link

@njhale: All pull requests linked via external trackers have merged:

Bugzilla bug 1845588 has been moved to the MODIFIED state.

In response to this:

[release-4.5] Bug 1845588: fix(images): use docker/podman create and cp for exec unpacking

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

@ecordell ecordell

@exdx exdx

Assignees

@kevinrizza kevinrizza

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@njhale @openshift-ci-robot @kevinrizza @shawn-hurley @eparis @openshift-bot @markmc @openshift-merge-robot