Skip to content

Commit d0f10ea

Browse files
committed
encoding/jsonschema: CRD metadata field is not required
The `metadata` field should not be treated as required when producing CRDs. Signed-off-by: Roger Peppe <[email protected]> Change-Id: I24ba87391fda9a7fa390a07d86afe761324313bb Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1214630 Reviewed-by: Daniel Martí <[email protected]> Unity-Result: CUE porcuepine <[email protected]> TryBot-Result: CUEcueckoo <[email protected]>
1 parent 050844f commit d0f10ea

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

encoding/jsonschema/constraints_object.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func constraintEmbeddedResource(key string, n cue.Value, s *state) {
159159
s.builder.put(resourceDefinitionPath, ast.NewStruct(
160160
"apiVersion", token.NOT, ast.NewIdent("string"),
161161
"kind", token.NOT, ast.NewIdent("string"),
162-
"metadata", token.NOT, ast.NewStruct(&ast.Ellipsis{}),
162+
"metadata", token.OPTION, ast.NewStruct(&ast.Ellipsis{}),
163163
), nil)
164164
refExpr, err := s.builder.getRef(resourceDefinitionPath)
165165
if err != nil {

encoding/jsonschema/testdata/txtar/crd_embeddedresource.txtar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ r2?: {
7171
_embeddedResource: {
7272
apiVersion!: string
7373
kind!: string
74-
metadata!: {
74+
metadata?: {
7575
...
7676
}
7777
}

encoding/jsonschema/testdata/txtar/crd_intorstring.txtar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec?: int | string
3535
_embeddedResource: {
3636
apiVersion!: string
3737
kind!: string
38-
metadata!: {
38+
metadata?: {
3939
...
4040
}
4141
}

encoding/jsonschema/testdata/txtar/crd_intorstring_with_anyof.txtar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec?: matchN(>=1, [int, string]) & (int | string)
4141
_embeddedResource: {
4242
apiVersion!: string
4343
kind!: string
44-
metadata!: {
44+
metadata?: {
4545
...
4646
}
4747
}

encoding/jsonschema/testdata/txtar/crd_preserve_unknown.txtar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ pruning?: {
9797
_embeddedResource: {
9898
apiVersion!: string
9999
kind!: string
100-
metadata!: {
100+
metadata?: {
101101
...
102102
}
103103
}

encoding/jsonschema/testdata/txtar/crd_simple.txtar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec?: {
3838
_embeddedResource: {
3939
apiVersion!: string
4040
kind!: string
41-
metadata!: {
41+
metadata?: {
4242
...
4343
}
4444
}

0 commit comments

Comments
 (0)