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.
cgwalters · Jun 8, 2022 · 071527b · 071527b
1 parent de628bc
commit 071527b
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 6 deletions.
diff --git a/gangplank/vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go b/gangplank/vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go
diff --git a/gangplank/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go b/gangplank/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go
diff --git a/mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go b/mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go
diff --git a/mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go b/mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go
diff --git a/schema/cosa/cosa_v1.go b/schema/cosa/cosa_v1.go
@@ -1,7 +1,7 @@
 package cosa
 
 // generated by 'make schema'
-// source hash: be093d10a3ebf57e28907a5676a88928631bb09eee602dff89f381ddd1ca8f5e
+// source hash: db5eff281bcc21027045f669a0583557e8fe7116bd44e90aef798fab7280b916
 
 type AdvisoryDiff []AdvisoryDiffItems
 
@@ -61,6 +61,7 @@ type Build struct {
 	Name                      string                `json:"name"`
 	Oscontainer               *Image                `json:"oscontainer,omitempty"`
 	OstreeCommit              string                `json:"ostree-commit"`
+	OstreeContainerImage      *OstreeContainerImage `json:"baseos-container,omitempty"`
 	OstreeContentBytesWritten int                   `json:"ostree-content-bytes-written,omitempty"`
 	OstreeContentChecksum     string                `json:"ostree-content-checksum"`
 	OstreeNCacheHits          int                   `json:"ostree-n-cache-hits,omitempty"`
@@ -153,6 +154,10 @@ type KubeVirt struct {
 	Image string `json:"image"`
 }
 
+type OstreeContainerImage struct {
+	Image string `json:"image"`
+}
+
 type PackageSetDifferences []PackageSetDifferencesItems
 
 type PackageSetDifferencesItems interface{}

diff --git a/schema/cosa/schema_doc.go b/schema/cosa/schema_doc.go
@@ -1,5 +1,5 @@
 // Generated by ./generate-schema.sh
-// Source hash: be093d10a3ebf57e28907a5676a88928631bb09eee602dff89f381ddd1ca8f5e
+// Source hash: db5eff281bcc21027045f669a0583557e8fe7116bd44e90aef798fab7280b916
 // DO NOT EDIT
 
 package cosa
@@ -211,6 +211,7 @@ var generatedSchemaJSON = `{
    "amis",
    "azure",
    "azurestack",
+   "baseos-container",
    "build-url",
    "digitalocean",
    "exoscale",
@@ -842,6 +843,21 @@ var generatedSchemaJSON = `{
      "title":"Azure",
      "$ref": "#/definitions/cloudartifact"
     },
+    "baseos-container": {
+      "$id":"#/properties/baseos-container",
+      "type":"object",
+      "title":"OSTree container image",
+      "required": [
+        "image"
+      ],
+      "properties": {
+        "image": {
+          "$id":"#/properties/baseos-container/image",
+          "type":"string",
+          "title":"Image"
+        }
+      }
+    },
    "gcp": {
      "$id":"#/properties/gcp",
      "type":"object",

diff --git a/schema/v1.json b/schema/v1.json
@@ -205,6 +205,7 @@
    "amis",
    "azure",
    "azurestack",
+   "baseos-container",
    "build-url",
    "digitalocean",
    "exoscale",
@@ -836,6 +837,21 @@
      "title":"Azure",
      "$ref": "#/definitions/cloudartifact"
     },
+    "baseos-container": {
+      "$id":"#/properties/baseos-container",
+      "type":"object",
+      "title":"OSTree container image",
+      "required": [
+        "image"
+      ],
+      "properties": {
+        "image": {
+          "$id":"#/properties/baseos-container/image",
+          "type":"string",
+          "title":"Image"
+        }
+      }
+    },
    "gcp": {
      "$id":"#/properties/gcp",
      "type":"object",

diff --git a/src/v1.json b/src/v1.json
@@ -205,6 +205,7 @@
    "amis",
    "azure",
    "azurestack",
+   "baseos-container",
    "build-url",
    "digitalocean",
    "exoscale",
@@ -836,6 +837,21 @@
      "title":"Azure",
      "$ref": "#/definitions/cloudartifact"
     },
+    "baseos-container": {
+      "$id":"#/properties/baseos-container",
+      "type":"object",
+      "title":"OSTree container image",
+      "required": [
+        "image"
+      ],
+      "properties": {
+        "image": {
+          "$id":"#/properties/baseos-container/image",
+          "type":"string",
+          "title":"Image"
+        }
+      }
+    },
    "gcp": {
      "$id":"#/properties/gcp",
      "type":"object",