Skip to content

Bug 1837675: Backport enhancements/oc/mirroring-release-signatures implementation #426

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 4 commits into from
May 29, 2020
Merged

Bug 1837675: Backport enhancements/oc/mirroring-release-signatures implementation #426

openshift-merge-robot merged 4 commits into from
May 29, 2020

Conversation

@jottofar
Copy link
Contributor

@jottofar jottofar commented May 18, 2020

Backport #343 "Implement enhancements/oc/mirroring-release-signatures". Reference https://issues.redhat.com/browse/OTA-210.

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 18, 2020

@jottofar: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

Backport enhancements/oc/mirroring-release-signatures implementation

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.

@jottofar jottofar force-pushed the ota-210-backport-prepare-signatures branch 2 times, most recently from de33cd8 to 7d19357 Compare May 18, 2020 22:46
@wking
Copy link
Member

wking commented May 18, 2020

You also want #392, right?

@jottofar
Copy link
Contributor Author

jottofar commented May 19, 2020

You also want #392, right?

Yes I do :) Thanks.

@jottofar jottofar force-pushed the ota-210-backport-prepare-signatures branch from 6d51b1d to b2b57fc Compare May 19, 2020 01:16
@jottofar jottofar changed the title Backport enhancements/oc/mirroring-release-signatures implementation Bug 1837404: Backport enhancements/oc/mirroring-release-signatures implementation May 19, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label May 19, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 19, 2020

@jottofar: This pull request references Bugzilla bug 1837404, which is invalid:

  • expected the bug to target the "4.4.z" release, but it targets "---" instead
  • expected Bugzilla bug 1837404 to depend on a bug targeting a release in 4.5.0, 4.5.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

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.

Details

In response to this:

Bug 1837404: Backport enhancements/oc/mirroring-release-signatures implementation

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/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label May 19, 2020
@jottofar
Copy link
Contributor Author

jottofar commented May 19, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 19, 2020

@jottofar: This pull request references Bugzilla bug 1837404, which is invalid:

  • expected Bugzilla bug 1837404 to depend on a bug targeting a release in 4.5.0, 4.5.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

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.

Details

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.

@jottofar
Copy link
Contributor Author

jottofar commented May 19, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 19, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 19, 2020

@jottofar: This pull request references Bugzilla bug 1837404, which is valid. The bug has been moved to the POST state. 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.4.z) matches configured target release for branch (4.4.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1825565 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1825565 targets the "4.5.0" release, which is one of the valid target releases: 4.5.0, 4.5.z
  • bug has dependents
Details

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 removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label May 19, 2020
@jottofar
Copy link
Contributor Author

jottofar commented May 19, 2020

/retest

soltysh
soltysh suggested changes May 19, 2020
View reviewed changes
@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 May 19, 2020
@jottofar jottofar changed the title Bug 1837404: Backport enhancements/oc/mirroring-release-signatures implementation Bug 1837675: Backport enhancements/oc/mirroring-release-signatures implementation May 19, 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. and removed bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels May 19, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 19, 2020

@jottofar: This pull request references Bugzilla bug 1837675, which is invalid:

  • expected dependent Bugzilla bug 1837404 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is MODIFIED 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.

Details

In response to this:

Bug 1837675: Backport enhancements/oc/mirroring-release-signatures implementation

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.

@soltysh
Copy link
Contributor

soltysh commented May 21, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 21, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 21, 2020

@soltysh: This pull request references Bugzilla bug 1837675, 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.4.z) matches configured target release for branch (4.4.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1837404 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1837404 targets the "4.5.0" release, which is one of the valid target releases: 4.5.0, 4.5.z
  • bug has dependents
Details

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 removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label May 21, 2020
@soltysh
Copy link
Contributor

soltysh commented May 21, 2020

This is waiting for openshift/library-go#800

@openshift-bot
Copy link
Contributor

openshift-bot commented May 29, 2020

/retest

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

6 similar comments
@openshift-bot
Copy link
Contributor

openshift-bot commented May 29, 2020

/retest

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

@openshift-bot
Copy link
Contributor

openshift-bot commented May 29, 2020

/retest

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

@openshift-bot
Copy link
Contributor

openshift-bot commented May 29, 2020

/retest

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

@openshift-bot
Copy link
Contributor

openshift-bot commented May 29, 2020

/retest

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

@openshift-bot
Copy link
Contributor

openshift-bot commented May 29, 2020

/retest

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

@openshift-bot
Copy link
Contributor

openshift-bot commented May 29, 2020

/retest

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

@sdodson
Copy link
Member

sdodson commented May 29, 2020

/lgtm cancel
Needs rebase which will require a new lgtm anyway.

@openshift-bot
Copy link
Contributor

openshift-bot commented May 29, 2020

/retest

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

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label May 29, 2020
@ashcrow ashcrow removed the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 29, 2020
@ashcrow
Copy link
Member

ashcrow commented May 29, 2020

Removing cherry-pick-approved until rebase and retest.

@jottofar jottofar force-pushed the ota-210-backport-prepare-signatures branch from 30f74fa to 71be8d5 Compare May 29, 2020 14:21
@wking @jottofar
pkg/cli/admin/release/mirror: Allow --apply-release-image-signature a…
2d77b25 
…nd --release-image-signature-to-dir

Applying directly to a cluster and writing to a local file are
orthogonal actions, and we can do both or neither.  This commit
removes previous restrictions from 331c1a1 (Implement
enhancements/oc/mirroring-release-signatures, 2020-04-17, openshift#343) to:

* Allow users to set both flags for a single 'oc' invocation.  To
  support this, some dry-run 'continue' were removed, because in the
  case where all of:

    --dry-run --apply-release-image-signature --release-image-signature-to-dir=whatever

  are set, we want to log both the fact that we'd be applying and
  writing-to-disk each signature, and not log the application but skip
  over the writing-to-disk log.

* Allow for mirrors that set none of --apply-release-image-signature,
  --release-image-signature-to-dir, or --to-dir.  This provides
  backwards compatibility with earlier 'oc', which did not interact
  with signatures at all [1].

Also fix a few nits by:

* Using filepath.Join to create the ReleaseImageSignatureToDir
  fallback, so we are not sensitive to whether a given --to-dir did or
  did not end in whatever the local path separator happens to be.
* Replacing tabs with spaces where they appeared within LongDesc
  lines.
* Converting handleSignatures to return an error, so we don't end up
  exiting zero if signature handling is requested by the user but
  fails to happen.  This also simplifies logging, because we only need
  to attach a little bit of context as we bubble the errors up, and
  final formatting for user display can happen at some higher-level,
  centralized location.
* Only bothering with Signatures() and warning on their empty-ness if
  the user wants us do to something with the signatures.
* Checking to ensure that the release digest appears in the signature
  cache.

[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1825565
@jottofar jottofar force-pushed the ota-210-backport-prepare-signatures branch from 71be8d5 to 2d77b25 Compare May 29, 2020 14:28
@sdodson
Copy link
Member

sdodson commented May 29, 2020

/lgtm

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

openshift-ci-robot commented May 29, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jottofar, sdodson, soltysh

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:

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

@sdodson sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 29, 2020
@sdodson
Copy link
Member

sdodson commented May 29, 2020

I've reapplied the label now that it's been rebased.

@openshift-merge-robot openshift-merge-robot merged commit 4ff35aa into openshift:release-4.4 May 29, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 29, 2020

@jottofar: All pull requests linked via external trackers have merged: openshift/oc#426, openshift/library-go#800. Bugzilla bug 1837675 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1837675: Backport enhancements/oc/mirroring-release-signatures implementation

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.

wking pushed a commit to wking/oc that referenced this pull request Jun 8, 2020
@smarterclayton @wking
release: Mirroring from custom directory via oc adm release mirror fails
dbe3f73 
The command fails when specifying a non-default from directory because
the from directory was not passed to either extract or mirror. Add that
transformation.

Also include the Parallel options as good practice even if they are
not heavily used in these flows.

Backporting 4882c8f (openshift#446) and
resolving a context conflict because 4.3 does not include 3ddaf4d
(cherry-pick 331c1a1, 2020-04-17, openshift#426).
This was referenced Jun 8, 2020
Closed
Merged
wking pushed a commit to wking/oc that referenced this pull request Jun 26, 2020
@smarterclayton @wking
release: Mirroring from custom directory via oc adm release mirror fails
fdc81b9 
The command fails when specifying a non-default from directory because
the from directory was not passed to either extract or mirror. Add that
transformation.

Also include the Parallel options as good practice even if they are
not heavily used in these flows.

Backporting 4882c8f (openshift#446) and
resolving a context conflict because 4.3 does not include 3ddaf4d
(cherry-pick 331c1a1, 2020-04-17, openshift#426).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@deads2k deads2k Awaiting requested review from deads2k

1 more reviewer

@soltysh soltysh soltysh approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@sdodson sdodson

@soltysh soltysh

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high 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.

8 participants

@jottofar @openshift-ci-robot @wking @soltysh @ashcrow @openshift-bot @sdodson @openshift-merge-robot