Skip to content

Commit

Permalink
schema: remove invalid top-level keys
Browse files Browse the repository at this point in the history
The "azurestack", "digitalocean", and "exoscale" keys are all image
artifacts that go under the `images` key. So they shouldn't be listed
as optional entries in the top-level dict.

Remove those until we actually have support for uploading to those
clouds (though e.g. azurestack is clearly one to which that will never
apply).

See also: #3889
  • Loading branch information
jlebon authored and gursewak1997 committed Sep 25, 2024
1 parent 23cdc20 commit 25ae36e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion pkg/builds/cosa_v1.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package builds

// generated by 'make schema'
// source hash: 4c19aed3b3d84af278780bff63728510bb3e70613e4c4eef8cabd7939eb31bd8
// source hash: 4bb2fd8591ae1cc9179181b9efcb550542137a01c9544fd048e66794e0fb176a

type AdvisoryDiff []AdvisoryDiffItems

Expand Down
5 changes: 1 addition & 4 deletions pkg/builds/schema_doc.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Generated by ./generate-schema.sh
// Source hash: 4c19aed3b3d84af278780bff63728510bb3e70613e4c4eef8cabd7939eb31bd8
// Source hash: 4bb2fd8591ae1cc9179181b9efcb550542137a01c9544fd048e66794e0fb176a
// DO NOT EDIT

package builds
Expand Down Expand Up @@ -220,11 +220,8 @@ var generatedSchemaJSON = `{
"aliyun",
"amis",
"azure",
"azurestack",
"base-oscontainer",
"build-url",
"digitalocean",
"exoscale",
"gcp",
"kubevirt",
"ibmcloud",
Expand Down
4 changes: 2 additions & 2 deletions src/cmd-cloud-prune
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ 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
# 4c19aed3b3d84af278780bff63728510bb3e70613e4c4eef8cabd7939eb31bd8. If changing
# 4bb2fd8591ae1cc9179181b9efcb550542137a01c9544fd048e66794e0fb176a. If changing
# this hash, ensure that the list of SUPPORTED and UNSUPPORTED artifacts below
# is up to date.
SUPPORTED = ["amis", "gcp"]
UNSUPPORTED = ["aliyun", "azurestack", "digitalocean", "exoscale", "ibmcloud", "powervs", "azure"]
UNSUPPORTED = ["aliyun", "azure", "ibmcloud", "powervs"]


def parse_args():
Expand Down
3 changes: 0 additions & 3 deletions src/v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,8 @@
"aliyun",
"amis",
"azure",
"azurestack",
"base-oscontainer",
"build-url",
"digitalocean",
"exoscale",
"gcp",
"kubevirt",
"ibmcloud",
Expand Down

0 comments on commit 25ae36e

Please sign in to comment.