Skip to content

Commit 1c3f68f

Browse files
committed
schema: Add entry for base-oscontainer
For now, we need to support having the new format oscontainer in `meta.json`. Part of coreos#2685 And see coreos#2685 (comment) in particular.
1 parent 4db0e09 commit 1c3f68f

File tree

4 files changed

+55
-2
lines changed

4 files changed

+55
-2
lines changed

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: db5eff281bcc21027045f669a0583557e8fe7116bd44e90aef798fab7280b916
55

66
type AdvisoryDiff []AdvisoryDiffItems
77

@@ -61,6 +61,7 @@ type Build struct {
6161
Name string `json:"name"`
6262
Oscontainer *Image `json:"oscontainer,omitempty"`
6363
OstreeCommit string `json:"ostree-commit"`
64+
OstreeContainerImage *OstreeContainerImage `json:"baseos-container,omitempty"`
6465
OstreeContentBytesWritten int `json:"ostree-content-bytes-written,omitempty"`
6566
OstreeContentChecksum string `json:"ostree-content-checksum"`
6667
OstreeNCacheHits int `json:"ostree-n-cache-hits,omitempty"`
@@ -153,6 +154,10 @@ type KubeVirt struct {
153154
Image string `json:"image"`
154155
}
155156

157+
type OstreeContainerImage struct {
158+
Image string `json:"image"`
159+
}
160+
156161
type PackageSetDifferences []PackageSetDifferencesItems
157162

158163
type PackageSetDifferencesItems interface{}

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: db5eff281bcc21027045f669a0583557e8fe7116bd44e90aef798fab7280b916
33
// DO NOT EDIT
44

55
package cosa
@@ -211,6 +211,7 @@ var generatedSchemaJSON = `{
211211
"amis",
212212
"azure",
213213
"azurestack",
214+
"baseos-container",
214215
"build-url",
215216
"digitalocean",
216217
"exoscale",
@@ -842,6 +843,21 @@ var generatedSchemaJSON = `{
842843
"title":"Azure",
843844
"$ref": "#/definitions/cloudartifact"
844845
},
846+
"baseos-container": {
847+
"$id":"#/properties/baseos-container",
848+
"type":"object",
849+
"title":"OSTree container image",
850+
"required": [
851+
"image"
852+
],
853+
"properties": {
854+
"image": {
855+
"$id":"#/properties/baseos-container/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+
"baseos-container",
208209
"build-url",
209210
"digitalocean",
210211
"exoscale",
@@ -836,6 +837,21 @@
836837
"title":"Azure",
837838
"$ref": "#/definitions/cloudartifact"
838839
},
840+
"baseos-container": {
841+
"$id":"#/properties/baseos-container",
842+
"type":"object",
843+
"title":"OSTree container image",
844+
"required": [
845+
"image"
846+
],
847+
"properties": {
848+
"image": {
849+
"$id":"#/properties/baseos-container/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+
"baseos-container",
208209
"build-url",
209210
"digitalocean",
210211
"exoscale",
@@ -836,6 +837,21 @@
836837
"title":"Azure",
837838
"$ref": "#/definitions/cloudartifact"
838839
},
840+
"baseos-container": {
841+
"$id":"#/properties/baseos-container",
842+
"type":"object",
843+
"title":"OSTree container image",
844+
"required": [
845+
"image"
846+
],
847+
"properties": {
848+
"image": {
849+
"$id":"#/properties/baseos-container/image",
850+
"type":"string",
851+
"title":"Image"
852+
}
853+
}
854+
},
839855
"gcp": {
840856
"$id":"#/properties/gcp",
841857
"type":"object",

0 commit comments

Comments
 (0)