github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Explicitly exclude unmarshaled fields for custom-marshaled types from standard JSON handling

Browse Source
This commit is contained in:
Jordan Liggitt 2023-02-21 12:50:36 -05:00
parent 12ceec47aa
commit 5f9a042284
No known key found for this signature in database
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types_jsonschema.go
View File

@ -240,7 +240,7 @@ type ValidationRule struct {
// JSON represents any valid JSON value. // JSON represents any valid JSON value.
// These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil. // These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
type JSON struct { type JSON struct {
Raw []byte `protobuf:"bytes,1,opt,name=raw"` Raw []byte `json:"-" protobuf:"bytes,1,opt,name=raw"`
} }
// OpenAPISchemaType is used by the kube-openapi generator when constructing // OpenAPISchemaType is used by the kube-openapi generator when constructing

2
staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types_jsonschema.go
View File

@ -240,7 +240,7 @@ type ValidationRule struct {
// JSON represents any valid JSON value. // JSON represents any valid JSON value.
// These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil. // These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
type JSON struct { type JSON struct {
Raw []byte `protobuf:"bytes,1,opt,name=raw"` Raw []byte `json:"-" protobuf:"bytes,1,opt,name=raw"`
} }
// OpenAPISchemaType is used by the kube-openapi generator when constructing // OpenAPISchemaType is used by the kube-openapi generator when constructing

2
staging/src/k8s.io/apimachinery/pkg/runtime/types.go
View File

@ -123,7 +123,7 @@ type Unknown struct {
// Raw will hold the complete serialized object which couldn't be matched // Raw will hold the complete serialized object which couldn't be matched
// with a registered type. Most likely, nothing should be done with this // with a registered type. Most likely, nothing should be done with this
// except for passing it through the system. // except for passing it through the system.
Raw []byte `protobuf:"bytes,2,opt,name=raw"` Raw []byte `json:"-" protobuf:"bytes,2,opt,name=raw"`
// ContentEncoding is encoding used to encode 'Raw' data. // ContentEncoding is encoding used to encode 'Raw' data.
// Unspecified means no encoding. // Unspecified means no encoding.
ContentEncoding string `protobuf:"bytes,3,opt,name=contentEncoding"` ContentEncoding string `protobuf:"bytes,3,opt,name=contentEncoding"`