github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 06:43:54 +00:00
Code Issues Projects Releases Wiki Activity

allow empty object to be CEL value.

Browse Source
This commit is contained in:
Jiahui Feng 2023-10-23 15:30:17 -07:00
parent 18d5a6fa64
commit c6b3a2f477
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/apiserver/pkg/cel/common/values.go
View File

@ -84,9 +84,15 @@ func UnstructuredToVal(unstructured interface{}, schema Schema) ref.Val {
},
}
}
// A object with x-kubernetes-preserve-unknown-fields but no properties or additionalProperties is treated
// as an empty object.
if schema.IsXPreserveUnknownFields() {
// properties and additionalProperties are mutual exclusive, but nothing prevents the situation
// where both are missing.
// An object that (1) has no properties (2) has no additionalProperties or additionalProperties == false
// is treated as an empty object.
// An object that has additionalProperties == true is treated as an unstructured map.
// An object that has x-kubernetes-preserve-unknown-field extension set is treated as an unstructured map.
// Empty object vs unstructured map is differentiated by unstructuredMap implementation with the set schema.
// The resulting result remains the same.
return &unstructuredMap{
value: m,
schema: schema,
@ -95,8 +101,6 @@ func UnstructuredToVal(unstructured interface{}, schema Schema) ref.Val {
},
}
}
return types.NewErr("invalid object type, expected either Properties or AdditionalProperties with Allows=true and non-empty Schema")
}
if schema.Type() == "array" {
l, ok := unstructured.([]interface{})

9
staging/src/k8s.io/apiserver/pkg/cel/openapi/values_test.go
View File

@ -97,6 +97,9 @@ var (
Type: []string{"object"},
AdditionalProperties: &spec.SchemaOrBool{Schema: stringSchema},
}}
emptyObjectSchema = &spec.Schema{
SchemaProps: spec.SchemaProps{Type: []string{"object"}},
}
)
func TestEquality(t *testing.T) {
@ -331,6 +334,12 @@ func TestEquality(t *testing.T) {
rhs: UnstructuredToVal([]interface{}{"a", "b", "c"}, atomicListSchema),
equal: false,
},
{
name: "empty objects are equal",
lhs: UnstructuredToVal(map[string]interface{}{}, emptyObjectSchema),
rhs: UnstructuredToVal(map[string]interface{}{}, emptyObjectSchema),
equal: true,
},
{
name: "identical objects are equal",
lhs: UnstructuredToVal(map[string]interface{}{"field1": "a", "field2": "b"}, objectSchema),