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.

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

schema: support multiple images destinations #4038

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

schema: support multiple images destinations #4038

wants to merge 4 commits into from
+207 −347

Conversation

jbtrystram
Copy link
Contributor

In coreos/fedora-coreos-pipeline#1091 we added the possibility of publishing container images to multiples repositories.

This needs to be reflected in the schema otherwhise we only record one image (currenlty the last pushed).

Add a primary-image key that extends image by adding an additional-images array.

Use that for relevant container images objects.

See coreos/fedora-coreos-pipeline#1099

jbtrystram added a commit to jbtrystram/coreos-assembler that referenced this pull request Mar 11, 2025
@jbtrystram
cmd/push-container-manifest: use additional-images rather than overwrite

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
037b948 
in coreos/fedora-coreos-pipeline#1091 we started
publishing container images in multiples repos.
However the build.json was not reflecting that, only storing the last
pushed image data, overwriting it with each arch.

See coreos#4038
See coreos/fedora-coreos-pipeline#1099
jbtrystram added a commit to jbtrystram/coreos-assembler that referenced this pull request Mar 14, 2025
@jbtrystram
cmd/push-container-manifest: use additional-images rather than overwrite

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
6a620fb 
in coreos/fedora-coreos-pipeline#1091 we started
publishing container images in multiples repos.
However the build.json was not reflecting that, only storing the last
pushed image data, overwriting it with each arch.

See coreos#4038
See coreos/fedora-coreos-pipeline#1099
@jbtrystram jbtrystram force-pushed the schema-multi-images branch from 037b948 to 6a620fb Compare March 14, 2025 16:50
@jbtrystram
Copy link
Contributor Author

jbtrystram commented Mar 14, 2025 •
edited
Loading

Ok just tested that, pushing a couple of manifests on a testing repo :

jq '."base-oscontainer"' < builds/latest/x86_64/meta.json                                                                                
{
  "image": "quay.io/jbtrystramtestimages/testrepo1",
  "digest": "sha256:4d20a109cba763ca01d2ffa8c72b3e5f4038a619d50f54946836489499eeaf89",
  "tags": [
    "stable"
  ],
  "additional-images": [
    {
      "image": "quay.io/jbtrystramtestimages/testrepo2",
      "digest": "sha256:4d20a109cba763ca01d2ffa8c72b3e5f4038a619d50f54946836489499eeaf89",
      "tags": [
        "stable"
      ]
    },
    {
      "image": "quay.io/jbtrystramtestimages/fcos",
      "digest": "sha256:4d20a109cba763ca01d2ffa8c72b3e5f4038a619d50f54946836489499eeaf89",
      "tags": [
        "stable"
      ]
    }
  ]
}

jbtrystram added a commit to jbtrystram/coreos-assembler that referenced this pull request Mar 14, 2025
@jbtrystram
cmd/push-container-manifest: use additional-images rather than overwrite

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
69262ba 
in coreos/fedora-coreos-pipeline#1091 we started
publishing container images in multiples repos.
However the build.json was not reflecting that, only storing the last
pushed image data, overwriting it with each arch.

See coreos#4038
See coreos/fedora-coreos-pipeline#1099
@jbtrystram jbtrystram force-pushed the schema-multi-images branch from 6a620fb to 69262ba Compare March 14, 2025 17:11
jbtrystram added a commit to jbtrystram/coreos-assembler that referenced this pull request Mar 14, 2025
@jbtrystram
cmd/push-container-manifest: use additional-images rather than overwrite
7b93e72 
in coreos/fedora-coreos-pipeline#1091 we started
publishing container images in multiples repos.
However the build.json was not reflecting that, only storing the last
pushed image data, overwriting it with each arch.

See coreos#4038
See coreos/fedora-coreos-pipeline#1099
@jbtrystram jbtrystram force-pushed the schema-multi-images branch from 69262ba to 7b93e72 Compare March 14, 2025 17:34
jlebon
jlebon reviewed Mar 16, 2025
View reviewed changes
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

Needs a make schema-update. LGTM otherwise!

@jbtrystram
schema: support multiple images destinations
d20ee10 
In coreos/fedora-coreos-pipeline#1091 we added
the possibility of publishing container images to multiples repositories.

This needs to be reflected in the schema otherwhise we only record one
image (currenlty the last pushed).

Add a `primary-image` key that extends image by adding an `additional-images`
array.

Use that for relevant container images objects.

See coreos/fedora-coreos-pipeline#1099
jbtrystram added a commit to jbtrystram/coreos-assembler that referenced this pull request Mar 17, 2025
@jbtrystram
cmd/push-container-manifest: use additional-images rather than overwrite
ca4beba 
in coreos/fedora-coreos-pipeline#1091 we started
publishing container images in multiples repos.
However the build.json was not reflecting that, only storing the last
pushed image data, overwriting it with each arch.

See coreos#4038
See coreos/fedora-coreos-pipeline#1099
@jbtrystram jbtrystram force-pushed the schema-multi-images branch from 7b93e72 to ca4beba Compare March 17, 2025 10:21
jbtrystram added a commit to jbtrystram/coreos-assembler that referenced this pull request Mar 17, 2025
@jbtrystram
cmd/push-container-manifest: use additional-images rather than overwrite
d99eb2f 
in coreos/fedora-coreos-pipeline#1091 we started
publishing container images in multiples repos.
However the build.json was not reflecting that, only storing the last
pushed image data, overwriting it with each arch.

See coreos#4038
See coreos/fedora-coreos-pipeline#1099
@jbtrystram jbtrystram force-pushed the schema-multi-images branch from ca4beba to d99eb2f Compare March 17, 2025 10:23
@jbtrystram
Copy link
Contributor Author

Needs a make schema-update. LGTM otherwise!

i am hitting #4043

ravanelli
ravanelli previously approved these changes Mar 17, 2025
View reviewed changes
Copy link
Member

@ravanelli ravanelli left a comment

Choose a reason for hiding this comment

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

LGTM

ravanelli
ravanelli reviewed Mar 17, 2025
View reviewed changes
Copy link
Member

@ravanelli ravanelli left a comment

Choose a reason for hiding this comment

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

I would change the commit message:

Note that I had to force the update for entries in `go.sum` as the checksums had
changed. Fixes https://github.com/coreos/coreos-assembler/issues/4043.

@jbtrystram jbtrystram force-pushed the schema-multi-images branch from 257809d to b33dc1f Compare March 17, 2025 14:30
jbtrystram added a commit to jbtrystram/coreos-assembler that referenced this pull request Mar 17, 2025
@jbtrystram
cmd/push-container-manifest: use additional-images rather than overwrite
cc869e1 
in coreos/fedora-coreos-pipeline#1091 we started
publishing container images in multiples repos.
However the build.json was not reflecting that, only storing the last
pushed image data, overwriting it with each arch.

See coreos#4038
See coreos/fedora-coreos-pipeline#1099
@jbtrystram jbtrystram force-pushed the schema-multi-images branch 2 times, most recently from e173c7d to c61bd56 Compare March 19, 2025 15:00
@jbtrystram
cmd/push-container-manifest: use additional-images rather than overwrite
d392ab2 
in coreos/fedora-coreos-pipeline#1091 we started
publishing container images in multiples repos.
However the build.json was not reflecting that, only storing the last
pushed image data, overwriting it with each arch.

See coreos#4038
See coreos/fedora-coreos-pipeline#1099
@jbtrystram
Run make schema
7d5f35b 
In cc869e1 we introduced additionnal
images in the schema, update the generated go code to match.

Note that I had to force the update for some entries in `go.sum` as the
checksums had changed.
Fixes coreos#4043.
@jbtrystram
src/cmd-coreos-prune: update to new schema
Loading
Loading status checks…
117ba69
@jbtrystram jbtrystram force-pushed the schema-multi-images branch from c61bd56 to 117ba69 Compare March 20, 2025 07:57
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Mar 20, 2025

@jbtrystram: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/rhcos 117ba69 link true /test rhcos

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ravanelli ravanelli

@cverna cverna

@jlebon jlebon

@dustymabe dustymabe

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jbtrystram @ravanelli @cverna @jlebon