Skip to content

Commit 432636d

Browse files
cgwaltersjlebon
authored andcommitted
schema: Add entry for baseos-container
For now, we need to support having the new format oscontainer in `meta.json`. Part of #2685 And see #2685 (comment) in particular.
1 parent 75b7978 commit 432636d

File tree

8 files changed

+101
-6
lines changed

8 files changed

+101
-6
lines changed

gangplank/vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gangplank/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go

+17-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go

+17-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

schema/cosa/cosa_v1.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cosa
22

33
// generated by 'make schema'
4-
// source hash: be093d10a3ebf57e28907a5676a88928631bb09eee602dff89f381ddd1ca8f5e
4+
// source hash: ec49fcff4b25566b5f515909fd5fcc22a51c169449e8a6f50390551f7bf97506
55

66
type AdvisoryDiff []AdvisoryDiffItems
77

@@ -27,13 +27,18 @@ type Artifact struct {
2727
UncompressedSize int `json:"uncompressed-size,omitempty"`
2828
}
2929

30+
type BaseOsContainer struct {
31+
Image string `json:"image"`
32+
}
33+
3034
type Build struct {
3135
AdvisoryDiffAgainstParent AdvisoryDiff `json:"parent-advisories-diff,omitempty"`
3236
AdvisoryDiffBetweenBuilds AdvisoryDiff `json:"advisories-diff,omitempty"`
3337
AlibabaAliyunUploads []AliyunImage `json:"aliyun,omitempty"`
3438
Amis []Amis `json:"amis,omitempty"`
3539
Architecture string `json:"coreos-assembler.basearch,omitempty"`
3640
Azure *Cloudartifact `json:"azure,omitempty"`
41+
BaseOsContainer *BaseOsContainer `json:"base-oscontainer,omitempty"`
3742
BuildArtifacts *BuildArtifacts `json:"images,omitempty"`
3843
BuildID string `json:"buildid"`
3944
BuildRef string `json:"ref,omitempty"`

schema/cosa/schema_doc.go

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Generated by ./generate-schema.sh
2-
// Source hash: be093d10a3ebf57e28907a5676a88928631bb09eee602dff89f381ddd1ca8f5e
2+
// Source hash: ec49fcff4b25566b5f515909fd5fcc22a51c169449e8a6f50390551f7bf97506
33
// DO NOT EDIT
44

55
package cosa
@@ -211,6 +211,7 @@ var generatedSchemaJSON = `{
211211
"amis",
212212
"azure",
213213
"azurestack",
214+
"base-oscontainer",
214215
"build-url",
215216
"digitalocean",
216217
"exoscale",
@@ -842,6 +843,21 @@ var generatedSchemaJSON = `{
842843
"title":"Azure",
843844
"$ref": "#/definitions/cloudartifact"
844845
},
846+
"base-oscontainer": {
847+
"$id":"#/properties/base-oscontainer",
848+
"type":"object",
849+
"title":"Base OS container",
850+
"required": [
851+
"image"
852+
],
853+
"properties": {
854+
"image": {
855+
"$id":"#/properties/base-oscontainer/image",
856+
"type":"string",
857+
"title":"Image"
858+
}
859+
}
860+
},
845861
"gcp": {
846862
"$id":"#/properties/gcp",
847863
"type":"object",

schema/v1.json

+16
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
"amis",
206206
"azure",
207207
"azurestack",
208+
"base-oscontainer",
208209
"build-url",
209210
"digitalocean",
210211
"exoscale",
@@ -836,6 +837,21 @@
836837
"title":"Azure",
837838
"$ref": "#/definitions/cloudartifact"
838839
},
840+
"base-oscontainer": {
841+
"$id":"#/properties/base-oscontainer",
842+
"type":"object",
843+
"title":"Base OS container",
844+
"required": [
845+
"image"
846+
],
847+
"properties": {
848+
"image": {
849+
"$id":"#/properties/base-oscontainer/image",
850+
"type":"string",
851+
"title":"Image"
852+
}
853+
}
854+
},
839855
"gcp": {
840856
"$id":"#/properties/gcp",
841857
"type":"object",

src/v1.json

+16
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
"amis",
206206
"azure",
207207
"azurestack",
208+
"base-oscontainer",
208209
"build-url",
209210
"digitalocean",
210211
"exoscale",
@@ -836,6 +837,21 @@
836837
"title":"Azure",
837838
"$ref": "#/definitions/cloudartifact"
838839
},
840+
"base-oscontainer": {
841+
"$id":"#/properties/base-oscontainer",
842+
"type":"object",
843+
"title":"Base OS container",
844+
"required": [
845+
"image"
846+
],
847+
"properties": {
848+
"image": {
849+
"$id":"#/properties/base-oscontainer/image",
850+
"type":"string",
851+
"title":"Image"
852+
}
853+
}
854+
},
839855
"gcp": {
840856
"$id":"#/properties/gcp",
841857
"type":"object",

0 commit comments

Comments
 (0)