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

bump to cosign v2.2.3-carbide.3 for new annotation #322

Merged
merged 2 commits into from
Sep 18, 2024

Conversation

amartin120
Copy link
Contributor

@amartin120 amartin120 commented Sep 18, 2024

Please check below, if the PR fulfills these requirements:

  • Commit(s) and code follow the repositories guidelines.
  • Test(s) have been added or updated to support these change(s).
  • Doc(s) have been added or updated to support these change(s).

Associated Links:

Types of Changes:

  • Feature

Proposed Changes:

  • use the latest from our cosign fork that creates a new annotation in the index.json within the oci layout.
    • adds io.containerd.image.name as an annotation.
      • this is much like what's in the org.opencontainers.image.ref.name except it maintains the origin registry name.
    • existing annotation left alone to reduce the risk of breaking changes.
    • hauler store info will use the new annotation for image name.
      • charts and files on the info list will remain unchanged.

Verification/Testing of Changes:

  • tested hauler store info
  • tested hauler store add image/chart
  • tested hauler store sync --products rke2=v1.31.0+rke2r1 --platform linux/amd64
  • tested hauler store serve
  • tested hauler store copy
{
   "schemaVersion": 2,
   "manifests": [
      {
         "mediaType": "application/vnd.oci.image.manifest.v1+json",
         "size": 480,
         "digest": "sha256:65bbf2875bc748fbe2e2feeb9ec5b8e65f8b71770bdd3421531be693fdcfef31",
         "annotations": {
            "kind": "dev.cosignproject.cosign/image",
            "org.opencontainers.image.ref.name": "hauler/rancher:2.9.1"
         }
      },
      {
         "mediaType": "application/vnd.oci.image.manifest.v1+json",
         "size": 610,
         "digest": "sha256:9186e638ccc30c5d1a2efd5a2cd632f49bb5013f164f6f85c48ed6fce90fe38f",
         "annotations": {
            "io.containerd.image.name": "index.docker.io/library/busybox:latest",
            "kind": "dev.cosignproject.cosign/image",
            "org.opencontainers.image.ref.name": "library/busybox:latest"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
         "size": 708,
         "digest": "sha256:d6cbb5dbd733a118f541e5fe827d04b9efa4338efa6ef9e9c334f375f8e6e76a",
         "annotations": {
            "io.containerd.image.name": "rgcrprod.azurecr.us/rancher/mirrored-elemental-operator:1.6.4",
            "kind": "dev.cosignproject.cosign/imageIndex",
            "org.opencontainers.image.ref.name": "rancher/mirrored-elemental-operator:1.6.4"
         }
      },
      {
         "mediaType": "application/vnd.oci.image.manifest.v1+json",
         "size": 2995,
         "digest": "sha256:e8f14b91431fda303243a87fb5d47575374c3ef2e9b8fb90f6fab2dcb634b7fc",
         "annotations": {
            "io.containerd.image.name": "rgcrprod.azurecr.us/rancher/mirrored-elemental-operator:1.6.4",
            "kind": "dev.cosignproject.cosign/sigs",
            "org.opencontainers.image.ref.name": "rancher/mirrored-elemental-operator:1.6.4"
         }
      }
   ]
}

image

Additional Context:

@dweomer dweomer linked an issue Sep 18, 2024 that may be closed by this pull request
@zackbradys zackbradys added enhancement New feature or request size/M Denotes an issue/PR requiring a relatively moderate amount of work dependencies Pull requests that update a dependency file labels Sep 18, 2024
@dweomer dweomer merged commit 01eebd5 into hauler-dev:main Sep 18, 2024
2 checks passed
@zackbradys zackbradys added this to the Hauler v1.1.0 milestone Sep 18, 2024
@amartin120 amartin120 mentioned this pull request Sep 23, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file enhancement New feature or request size/M Denotes an issue/PR requiring a relatively moderate amount of work
Projects
Status: Resolved
Development

Successfully merging this pull request may close these issues.

[feature] our cosign save stomps the registry for saved images
3 participants