Skip to content

Commit 3dbedef

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#80773 from jennybuckley/fix-rawextension
Fix raw extension openapi definition
2 parents 4fda120 + ef30bd6 commit 3dbedef

File tree

9 files changed

+1
-45
lines changed

9 files changed

+1
-45
lines changed

‎api/api-rules/apiextensions_violation_exceptions.list‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEve
3535
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,MicroTime,Time
3636
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,StatusCause,Type
3737
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Time,Time
38-
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
3938
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentEncoding
4039
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentType
4140
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,Raw

‎api/api-rules/codegen_violation_exceptions.list‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEve
3636
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,MicroTime,Time
3737
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,StatusCause,Type
3838
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Time,Time
39-
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
4039
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentEncoding
4140
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentType
4241
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,Raw

‎api/api-rules/sample_apiserver_violation_exceptions.list‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEve
3838
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,MicroTime,Time
3939
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,StatusCause,Type
4040
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Time,Time
41-
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
4241
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentEncoding
4342
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentType
4443
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,Raw

‎api/api-rules/violation_exceptions.list‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,6 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEve
555555
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,MicroTime,Time
556556
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,StatusCause,Type
557557
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Time,Time
558-
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
559558
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentEncoding
560559
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentType
561560
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,Raw

‎api/openapi-spec/swagger.json‎

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go‎

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apimachinery/pkg/runtime/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ type RawExtension struct {
9595
// Raw is the underlying serialization of this object.
9696
//
9797
// TODO: Determine how to detect ContentType and ContentEncoding of 'Raw' data.
98-
Raw []byte `protobuf:"bytes,1,opt,name=raw"`
98+
Raw []byte `json:"-" protobuf:"bytes,1,opt,name=raw"`
9999
// Object can hold a representation of this extension - useful for working with versioned
100100
// structs.
101101
Object Object `json:"-"`

‎staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go‎

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go‎

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)