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.

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

pkg/manifests.list.preferOCI(): pay attention to annotations in indexes #1822

Merged
merged 1 commit into from
Feb 6, 2024

Conversation

nalind
Copy link
Member

@nalind nalind commented Jan 24, 2024

Account for the presence of annotations in the OCI version of an index or list when deciding if the structure should be saved in OCI format. This requires removing an annotation from the test data so that the presence of "features" information for one of its instances will be the deciding factor.

I thought we could get by in #1816 without this, but without it, setting annotations in the index doesn't force us to save it in OCI format, even without any of the indicators present that would force us to use the Docker format, effectively throwing away those annotations.

Account for the presence of annotations in the OCI version of an index
or list when deciding if the structure should be saved in OCI format.
This requires removing an annotation from the test data so that the
presence of "features" information for one of its instances will be the
deciding factor.

If we don't take those into account, setting annotations in the index
doesn't force the index to be saved in OCI format, even with none of the
indicators present that would force use of the Docker format,
effectively throwing away those annotations.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@nalind
Copy link
Member Author

nalind commented Jan 24, 2024

/retitle pkg/manifests.list.preferOCI(): pay attention to annotations in indexes

@openshift-ci openshift-ci bot changed the title pkg/manifests.list.preferOCI(): pay attention annotations in indexes pkg/manifests.list.preferOCI(): pay attention to annotations in indexes Jan 24, 2024
@rhatdan
Copy link
Member

rhatdan commented Jan 25, 2024

LGTM
/approve
@vrothberg @Luap99 @umohnani8 @mheon @ashley-cui PTAL

@rhatdan rhatdan added the 5.0 label Jan 31, 2024
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Contributor

openshift-ci bot commented Feb 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, nalind, rhatdan

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-merge-bot openshift-merge-bot bot merged commit 70724d3 into containers:main Feb 6, 2024
7 checks passed
@nalind nalind deleted the prefer-oci branch February 6, 2024 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants