Skip to content

schema: support multiple images destinations #4038

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

Merged
jlebon merged 4 commits into from
Mar 27, 2025
Merged

schema: support multiple images destinations #4038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb222e2
schema: support multiple images destinations
jbtrystram Mar 11, 2025
c3067b4
cmd/push-container-manifest: use additional-images rather than overwrite
jbtrystram Mar 11, 2025
b5141f2
src/cmd-coreos-prune: update to new schema
jbtrystram Mar 19, 2025
1e8ac91
schema: update generated code with `make schema`
jbtrystram Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions pkg/builds/cosa_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package builds

// generated by 'make schema'
// source hash: 58da31f35c1405d5a752a297d0ee012f577720f810113d38cdabca102ec7edd8
// source hash: 1711aa3ce997c644130139e1318d2683e2a5f11538e2b0528771a8658d62ee64

type AdvisoryDiff []AdvisoryDiffItems

Expand Down Expand Up @@ -34,7 +34,7 @@ type Build struct {
Amis []Amis `json:"amis,omitempty"`
Architecture string `json:"coreos-assembler.basearch,omitempty"`
Azure *Cloudartifact `json:"azure,omitempty"`
BaseOsContainer *Image `json:"base-oscontainer,omitempty"`
BaseOsContainer *PrimaryImage `json:"base-oscontainer,omitempty"`
BuildArtifacts *BuildArtifacts `json:"images,omitempty"`
BuildID string `json:"buildid"`
BuildRef string `json:"ref,omitempty"`
Expand All @@ -50,7 +50,7 @@ type Build struct {
CosaImageChecksum string `json:"coreos-assembler.image-config-checksum,omitempty"`
CosaImageVersion int `json:"coreos-assembler.image-genver,omitempty"`
Extensions *Extensions `json:"extensions,omitempty"`
ExtensionsContainer *Image `json:"extensions-container,omitempty"`
ExtensionsContainer *PrimaryImage `json:"extensions-container,omitempty"`
FedoraCoreOsParentCommit string `json:"fedora-coreos.parent-commit,omitempty"`
FedoraCoreOsParentVersion string `json:"fedora-coreos.parent-version,omitempty"`
Gcp *Gcp `json:"gcp,omitempty"`
Expand All @@ -59,10 +59,10 @@ type Build struct {
ImageInputChecksum string `json:"coreos-assembler.image-input-checksum,omitempty"`
InputHashOfTheRpmOstree string `json:"rpm-ostree-inputhash"`
Koji *Koji `json:"koji,omitempty"`
KubevirtContainer *Image `json:"kubevirt,omitempty"`
KubevirtContainer *PrimaryImage `json:"kubevirt,omitempty"`
MetaStamp float64 `json:"coreos-assembler.meta-stamp,omitempty"`
Name string `json:"name"`
Oscontainer *Image `json:"oscontainer,omitempty"`
Oscontainer *PrimaryImage `json:"oscontainer,omitempty"`
OstreeCommit string `json:"ostree-commit"`
OstreeContentBytesWritten int `json:"ostree-content-bytes-written,omitempty"`
OstreeContentChecksum string `json:"ostree-content-checksum"`
Expand Down Expand Up @@ -150,12 +150,14 @@ type Git struct {
}

type Image struct {
Comment string `json:"comment,omitempty"`
Digest string `json:"digest,omitempty"`
Image string `json:"image"`
Tags []Tag `json:"tags,omitempty"`
Comment string `json:"comment,omitempty"`
Digest string `json:"digest,omitempty"`
Image string `json:"image"`
Tags []ImageTag `json:"tags,omitempty"`
}

type ImageTag string

type Koji struct {
BuildRelease string `json:"release,omitempty"`
KojiBuildID float64 `json:"build_id,omitempty"`
Expand All @@ -166,10 +168,18 @@ type PackageSetDifferences []PackageSetDifferencesItems

type PackageSetDifferencesItems interface{}

type PrimaryImage struct {
AdditionalImages []interface{} `json:"additional-images,omitempty"`
Comment string `json:"comment,omitempty"`
Digest string `json:"digest,omitempty"`
Image string `json:"image"`
Tags []PrimaryImageTag `json:"tags,omitempty"`
}

type PrimaryImageTag string

type S3 struct {
Bucket string `json:"bucket,omitempty"`
Key string `json:"key,omitempty"`
PublicURL string `json:"public-url,omitempty"`
}

type Tag string
54 changes: 49 additions & 5 deletions pkg/builds/schema_doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Generated by ./generate-schema.sh
// Source hash: 58da31f35c1405d5a752a297d0ee012f577720f810113d38cdabca102ec7edd8
// Source hash: 1711aa3ce997c644130139e1318d2683e2a5f11538e2b0528771a8658d62ee64
// DO NOT EDIT

package builds
Expand Down Expand Up @@ -91,6 +91,50 @@ var generatedSchemaJSON = `{
}
}
},
"primary-image": {
"type": "object",
"required": [
"image"
],
"optional": [
"digest",
"tags",
"comment",
"additional-images"
],
"properties": {
"digest": {
"$id": "#/image/digest",
"type": "string",
"title": "Digest"
},
"comment": {
"$id": "#/image/comment",
"type": "string",
"title": "Comment"
},
"image": {
"$id": "#/image/image",
"type": "string",
"title": "Image"
},
"tags": {
"$id": "#/image/tags",
"type": "array",
"title": "Tags",
"items": {
"$id": "#/image/tags/item",
"title": "Tag",
"type": "string"
}
},
"additional-images": {
"$id": "#/image",
"type": "array",
"title": "Additional images"
}
}
},
"cloudartifact": {
"type": "object",
"required": [
Expand Down Expand Up @@ -708,7 +752,7 @@ var generatedSchemaJSON = `{
"$id": "#/properties/oscontainer",
"type": "object",
"title": "Oscontainer",
"$ref": "#/definitions/image"
"$ref": "#/definitions/primary-image"
},
"extensions": {
"$id": "#/properties/extensions",
Expand Down Expand Up @@ -927,13 +971,13 @@ var generatedSchemaJSON = `{
"$id": "#/properties/base-oscontainer",
"type": "object",
"title": "Base OS container",
"$ref": "#/definitions/image"
"$ref": "#/definitions/primary-image"
},
"extensions-container": {
"$id": "#/properties/extensions-container",
"type": "object",
"title": "Extensions container",
"$ref": "#/definitions/image"
"$ref": "#/definitions/primary-image"
},
"gcp": {
"$id": "#/properties/gcp",
Expand Down Expand Up @@ -974,7 +1018,7 @@ var generatedSchemaJSON = `{
"$id": "#/properties/kubevirt",
"type": "object",
"title": "Kubevirt container",
"$ref": "#/definitions/image"
"$ref": "#/definitions/primary-image"
},
"ibmcloud": {
"$id": "#/properties/ibmcloud",
Expand Down
26 changes: 16 additions & 10 deletions src/cmd-coreos-prune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Build = collections.namedtuple("Build", ["id", "images", "arch", "meta_json"])
# set metadata caching to 5m
CACHE_MAX_AGE_METADATA = 60 * 5
# These lists are up to date as of schema hash
# 58da31f35c1405d5a752a297d0ee012f577720f810113d38cdabca102ec7edd8. If changing
# 1711aa3ce997c644130139e1318d2683e2a5f11538e2b0528771a8658d62ee64. If changing
# this hash, ensure that the list of SUPPORTED and UNSUPPORTED artifacts below
# is up to date.
SUPPORTED = ["amis", "gcp"]
Expand Down Expand Up @@ -185,12 +185,13 @@ def main():
print(f"\t\t\tRelease {build_id} is a barrier release. Skipping container prune.")
continue
# Retrieve container tags excluding the stream name since it updates with each release.
container_tags, container_repo = get_container_tags(meta_json, exclude=[stream])
if container_tags:
for tag in container_tags:
prune_container(tag, args.dry_run, container_repo, args.registry_auth_file)
else:
print(f"\t\t\tNo container tags to prune for build {build_id}.")
containers = get_container_tags(meta_json, exclude=[stream])
for (container_repo, container_tags) in containers:
if container_tags:
for tag in container_tags:
prune_container(tag, args.dry_run, container_repo, args.registry_auth_file)
else:
print(f"\t\t\tNo container tags to prune for build {build_id}.")
actions_completed.append(action) # Append action to completed list
# Only add policy-cleanup for the build in builds.json if any
# of the cleanup actions were completed.
Expand Down Expand Up @@ -450,9 +451,14 @@ def get_container_tags(meta_json, exclude):
if base_oscontainer:
tags = base_oscontainer.get("tags", [])
filtered_tags = [tag for tag in tags if tag not in exclude]
container_repo = base_oscontainer.get("image", "")
return filtered_tags, container_repo
return [], ""
container_repos = [(base_oscontainer.get("image", ""), filtered_tags)]
additional_images = base_oscontainer.get("additional-images", [])
for image in additional_images:
tags = image.get("tags", [])
filtered_tags = [tag for tag in tags if tag not in exclude]
container_repos.append((image.get("image", ""), filtered_tags))
return container_repos
return []


def prune_container(tag, dry_run, container_repo, registry_auth_file):
Expand Down
8 changes: 7 additions & 1 deletion src/cmd-push-container-manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,17 @@ def main():
arch = manifest['platform']['architecture']
if arch in map_arch:
arch = map_arch[arch]
buildmetas[arch][args.metajsonname] = {
image = {
'image': args.repo,
'digest': manifest['digest'],
'tags': args.tags
}
if buildmetas[arch].get(args.metajsonname):
additional_images = buildmetas[arch][args.metajsonname].get('additional-images', [])
additional_images.append(image)
buildmetas[arch][args.metajsonname]['additional-images'] = additional_images
else:
buildmetas[arch][args.metajsonname] = image
buildmetas[arch].write(artifact_name=args.metajsonname)


Expand Down
52 changes: 48 additions & 4 deletions src/v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,50 @@
}
}
},
"primary-image": {
"type": "object",
"required": [
"image"
],
"optional": [
"digest",
"tags",
"comment",
"additional-images"
],
"properties": {
"digest": {
"$id": "#/image/digest",
"type": "string",
"title": "Digest"
},
"comment": {
"$id": "#/image/comment",
"type": "string",
"title": "Comment"
},
"image": {
"$id": "#/image/image",
"type": "string",
"title": "Image"
},
"tags": {
"$id": "#/image/tags",
"type": "array",
"title": "Tags",
"items": {
"$id": "#/image/tags/item",
"title": "Tag",
"type": "string"
}
},
"additional-images": {
"$id": "#/image",
"type": "array",
"title": "Additional images"
}
}
},
"cloudartifact": {
"type": "object",
"required": [
Expand Down Expand Up @@ -702,7 +746,7 @@
"$id": "#/properties/oscontainer",
"type": "object",
"title": "Oscontainer",
"$ref": "#/definitions/image"
"$ref": "#/definitions/primary-image"
},
"extensions": {
"$id": "#/properties/extensions",
Expand Down Expand Up @@ -921,13 +965,13 @@
"$id": "#/properties/base-oscontainer",
"type": "object",
"title": "Base OS container",
"$ref": "#/definitions/image"
"$ref": "#/definitions/primary-image"
},
"extensions-container": {
"$id": "#/properties/extensions-container",
"type": "object",
"title": "Extensions container",
"$ref": "#/definitions/image"
"$ref": "#/definitions/primary-image"
},
"gcp": {
"$id": "#/properties/gcp",
Expand Down Expand Up @@ -968,7 +1012,7 @@
"$id": "#/properties/kubevirt",
"type": "object",
"title": "Kubevirt container",
"$ref": "#/definitions/image"
"$ref": "#/definitions/primary-image"
},
"ibmcloud": {
"$id": "#/properties/ibmcloud",
Expand Down
Loading