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

oci: Introduce Flux media types #460

Merged
merged 3 commits into from
Feb 13, 2023
Merged

oci: Introduce Flux media types #460

merged 3 commits into from
Feb 13, 2023

Conversation

stefanprodan
Copy link
Member

@stefanprodan stefanprodan commented Feb 9, 2023

This PR changes the media type of the OCI artifacts produced by Flux to:

{
  "schemaVersion": 2,
  "mediaType": "application/vnd.oci.image.manifest.v1+json",
  "config": {
    "mediaType": "application/vnd.cncf.flux.config.v1+json",
    "size": 233,
    "digest": "sha256:1b80ecb1c04d4a9718a6094a00ed17b76ea8ff2bb846695fa38e7492d34f505c"
  },
  "layers": [
    {
      "mediaType": "application/vnd.cncf.flux.content.v1.tar+gzip",
      "size": 19081,
      "digest": "sha256:46c2b334705cd08db1a6fa46f860cd3364fc1a3636eea37a9b35537549086a1c"
    }
  ],
  "annotations": {
    "org.opencontainers.image.created": "2023-02-10T09:06:09Z",
    "org.opencontainers.image.revision": "test",
    "org.opencontainers.image.source": "test"
  }
}

Ref: fluxcd/flux2#3575

oci/constants.go Outdated Show resolved Hide resolved
@hiddeco hiddeco added enhancement New feature or request area/oci OCI related issues and pull requests labels Feb 9, 2023
@stefanprodan stefanprodan marked this pull request as ready for review February 10, 2023 09:17
Copy link
Member

@hiddeco hiddeco left a comment

Choose a reason for hiding this comment

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

Was looking forward to this since the initial introduction of the feature. Looks good to me, thanks Stefan 🙇

oci/client/push.go Outdated Show resolved Hide resolved
Copy link
Contributor

@darkowlzz darkowlzz left a comment

Choose a reason for hiding this comment

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

LGTM!
Left a comment about a minor improvement in test.
Thanks for silencing the verbose registry logs.

oci/client/push_pull_test.go Outdated Show resolved Hide resolved
@stefanprodan stefanprodan force-pushed the oci-media-type branch 2 times, most recently from 7b22443 to d9373ab Compare February 13, 2023 11:13
Signed-off-by: Stefan Prodan <[email protected]>
@stefanprodan stefanprodan merged commit db1f3af into main Feb 13, 2023
@stefanprodan stefanprodan deleted the oci-media-type branch February 13, 2023 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/oci OCI related issues and pull requests enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants