From 1325c6c46b9e49921bfd3277fcaa23c501ae8ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 29 Jul 2022 18:04:44 +0200 Subject: [PATCH] schema: make schema & make vendor for mantle --- .../coreos/coreos-assembler-schema/cosa/cosa_v1.go | 3 ++- .../coreos/coreos-assembler-schema/cosa/schema_doc.go | 9 ++++++++- schema/cosa/cosa_v1.go | 3 ++- schema/cosa/schema_doc.go | 9 ++++++++- schema/v1.json | 7 +++++++ 5 files changed, 27 insertions(+), 4 deletions(-) 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 index 2716c12f82..ea3db28086 100644 --- 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 @@ -1,7 +1,7 @@ package cosa // generated by 'make schema' -// source hash: f112cf9a91cffe89498147bd0d29f3c38b2d6d06d042807745a748a46586d508 +// source hash: 9f9cfcbb3f4768a04b2504655cf02a25f77234103cbfd1868b089e01dcbc361b type AdvisoryDiff []AdvisoryDiffItems @@ -46,6 +46,7 @@ type Build struct { BuildTimeStamp string `json:"coreos-assembler.build-timestamp,omitempty"` BuildURL string `json:"build-url,omitempty"` ConfigGitRev string `json:"coreos-assembler.config-gitrev,omitempty"` + ConfigVariant string `json:"coreos-assembler.config-variant,omitempty"` ContainerConfigGit *Git `json:"coreos-assembler.container-config-git,omitempty"` CoreOsSource string `json:"coreos-assembler.code-source,omitempty"` CosaContainerImageGit *Git `json:"coreos-assembler.container-image-git,omitempty"` 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 index 29e8ceed1f..5f64cbbc01 100644 --- 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 @@ -1,5 +1,5 @@ // Generated by ./generate-schema.sh -// Source hash: f112cf9a91cffe89498147bd0d29f3c38b2d6d06d042807745a748a46586d508 +// Source hash: 9f9cfcbb3f4768a04b2504655cf02a25f77234103cbfd1868b089e01dcbc361b // DO NOT EDIT package cosa @@ -234,6 +234,7 @@ var generatedSchemaJSON = `{ "coreos-assembler.code-source", "coreos-assembler.config-dirty", "coreos-assembler.config-gitrev", + "coreos-assembler.config-variant", "coreos-assembler.container-config-git", "coreos-assembler.container-image-git", "coreos-assembler.delayed-meta-merge", @@ -345,6 +346,12 @@ var generatedSchemaJSON = `{ "default": "", "minLength": 1 }, + "coreos-assembler.config-variant": { + "$id":"#/properties/coreos-assembler.config-variant", + "type":"string", + "title":"Config variant", + "default":"" + }, "coreos-assembler.container-config-git": { "$id": "#/properties/coreos-assembler.container-config-git", "type": "object", diff --git a/schema/cosa/cosa_v1.go b/schema/cosa/cosa_v1.go index 2716c12f82..ea3db28086 100644 --- a/schema/cosa/cosa_v1.go +++ b/schema/cosa/cosa_v1.go @@ -1,7 +1,7 @@ package cosa // generated by 'make schema' -// source hash: f112cf9a91cffe89498147bd0d29f3c38b2d6d06d042807745a748a46586d508 +// source hash: 9f9cfcbb3f4768a04b2504655cf02a25f77234103cbfd1868b089e01dcbc361b type AdvisoryDiff []AdvisoryDiffItems @@ -46,6 +46,7 @@ type Build struct { BuildTimeStamp string `json:"coreos-assembler.build-timestamp,omitempty"` BuildURL string `json:"build-url,omitempty"` ConfigGitRev string `json:"coreos-assembler.config-gitrev,omitempty"` + ConfigVariant string `json:"coreos-assembler.config-variant,omitempty"` ContainerConfigGit *Git `json:"coreos-assembler.container-config-git,omitempty"` CoreOsSource string `json:"coreos-assembler.code-source,omitempty"` CosaContainerImageGit *Git `json:"coreos-assembler.container-image-git,omitempty"` diff --git a/schema/cosa/schema_doc.go b/schema/cosa/schema_doc.go index 29e8ceed1f..5f64cbbc01 100644 --- a/schema/cosa/schema_doc.go +++ b/schema/cosa/schema_doc.go @@ -1,5 +1,5 @@ // Generated by ./generate-schema.sh -// Source hash: f112cf9a91cffe89498147bd0d29f3c38b2d6d06d042807745a748a46586d508 +// Source hash: 9f9cfcbb3f4768a04b2504655cf02a25f77234103cbfd1868b089e01dcbc361b // DO NOT EDIT package cosa @@ -234,6 +234,7 @@ var generatedSchemaJSON = `{ "coreos-assembler.code-source", "coreos-assembler.config-dirty", "coreos-assembler.config-gitrev", + "coreos-assembler.config-variant", "coreos-assembler.container-config-git", "coreos-assembler.container-image-git", "coreos-assembler.delayed-meta-merge", @@ -345,6 +346,12 @@ var generatedSchemaJSON = `{ "default": "", "minLength": 1 }, + "coreos-assembler.config-variant": { + "$id":"#/properties/coreos-assembler.config-variant", + "type":"string", + "title":"Config variant", + "default":"" + }, "coreos-assembler.container-config-git": { "$id": "#/properties/coreos-assembler.container-config-git", "type": "object", diff --git a/schema/v1.json b/schema/v1.json index c1a2a1fb06..1ddbf018f6 100644 --- a/schema/v1.json +++ b/schema/v1.json @@ -228,6 +228,7 @@ "coreos-assembler.code-source", "coreos-assembler.config-dirty", "coreos-assembler.config-gitrev", + "coreos-assembler.config-variant", "coreos-assembler.container-config-git", "coreos-assembler.container-image-git", "coreos-assembler.delayed-meta-merge", @@ -339,6 +340,12 @@ "default": "", "minLength": 1 }, + "coreos-assembler.config-variant": { + "$id":"#/properties/coreos-assembler.config-variant", + "type":"string", + "title":"Config variant", + "default":"" + }, "coreos-assembler.container-config-git": { "$id": "#/properties/coreos-assembler.container-config-git", "type": "object",