Skip to content

Replace non-existing manifests and prevent them from changing in the future#6425

Merged
everettraven merged 2 commits into
operator-framework:masterfrom
tkrishtop:fix_digests
May 16, 2023
Merged

Replace non-existing manifests and prevent them from changing in the future#6425
everettraven merged 2 commits into
operator-framework:masterfrom
tkrishtop:fix_digests

Conversation

@tkrishtop

Copy link
Copy Markdown
Contributor

Description of the change:

This PR is to be merged after the PR @acornett21 : #6422

  • Fix: Replace non-existing manifests for scorecard-storage and scorecard-untar that were accidentally overridden during the release 1.28.1.
  • Makefile: Prevent scorecard-storage and scorecard-untar from being rebuilt in the future.

Motivation for the change:

To support the integration of DCI, Preflight, and Operator-SDK in disconnected environments, we have to use the digests and not tags for scorecard-storage and scorecard-untar. We also have to protect these digests from being overwritten during the release process. All the details are here: #6417.

Checklist

If the pull request includes user-facing changes, extra documentation is required:

…future

Signed-off-by: Tatiana Krishtop <tkrishto@redhat.com>
@acornett21

Copy link
Copy Markdown
Contributor

@tkrishtop I was going to raise a follow up PR today, thanks for putting this together.

@everettraven everettraven left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks @tkrishtop ! The changes look good to me.

/lgtm

Placing a hold until #6422 is merged

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 15, 2023
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 15, 2023
@varshaprasad96 varshaprasad96 added this to the v1.29.0 milestone May 15, 2023
@acornett21 acornett21 mentioned this pull request May 15, 2023
@everettraven

Copy link
Copy Markdown
Contributor

Closing and reopening to try and pick up the changes that were merged in #6422

@everettraven

Copy link
Copy Markdown
Contributor

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 16, 2023
@everettraven everettraven temporarily deployed to deploy May 16, 2023 12:35 — with GitHub Actions Inactive
@everettraven everettraven temporarily deployed to deploy May 16, 2023 12:35 — with GitHub Actions Inactive
@everettraven everettraven temporarily deployed to deploy May 16, 2023 12:35 — with GitHub Actions Inactive
@everettraven everettraven temporarily deployed to deploy May 16, 2023 12:35 — with GitHub Actions Inactive
@everettraven everettraven temporarily deployed to deploy May 16, 2023 12:35 — with GitHub Actions Inactive
@everettraven everettraven temporarily deployed to deploy May 16, 2023 12:36 — with GitHub Actions Inactive
@everettraven everettraven temporarily deployed to deploy May 16, 2023 12:36 — with GitHub Actions Inactive
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label May 16, 2023
@tkrishtop tkrishtop temporarily deployed to deploy May 16, 2023 13:32 — with GitHub Actions Inactive
@tkrishtop tkrishtop temporarily deployed to deploy May 16, 2023 13:32 — with GitHub Actions Inactive
@tkrishtop tkrishtop temporarily deployed to deploy May 16, 2023 13:32 — with GitHub Actions Inactive
@tkrishtop tkrishtop temporarily deployed to deploy May 16, 2023 13:32 — with GitHub Actions Inactive
@tkrishtop tkrishtop temporarily deployed to deploy May 16, 2023 13:32 — with GitHub Actions Inactive
@tkrishtop tkrishtop temporarily deployed to deploy May 16, 2023 13:32 — with GitHub Actions Inactive
@tkrishtop tkrishtop temporarily deployed to deploy May 16, 2023 13:32 — with GitHub Actions Inactive
@tkrishtop

Copy link
Copy Markdown
Contributor Author

hi @everettraven I merged the master branch into fix_digests to pick the change of @acornett21

@everettraven everettraven left a comment

Copy link
Copy Markdown
Contributor

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 May 16, 2023
@everettraven

Copy link
Copy Markdown
Contributor

Merging as the sanity docs check failures are expected and should be resolved by #6414 . Created a new issue for the ansible molecule e2e: #6433

@everettraven everettraven merged commit 3159ef2 into operator-framework:master May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants