kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Temporary fix for alpha features test" 

Kubernetes-commit: 845e44dd207fc3793f8bab1b69665a816f966489
This commit is contained in:
Antoine Pelisse 2019-02-12 12:25:21 -08:00 committed by Kubernetes Publisher
parent 24ca62cbd3
commit 3afb63e414
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go
View File

@ -22,7 +22,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kube-openapi/pkg/schemaconv"
"k8s.io/kube-openapi/pkg/util/proto"
smdschema "sigs.k8s.io/structured-merge-diff/schema"
"sigs.k8s.io/structured-merge-diff/typed"
)
@ -49,7 +48,6 @@ func newGVKParser(models proto.Models) (*gvkParser, error) {
if err != nil {
return nil, fmt.Errorf("failed to convert models to schema: %v", err)
}
typeSchema = makeRawExtensionUntyped(typeSchema)
parser := gvkParser{
gvks: map[schema.GroupVersionKind]string{},
}
@ -120,20 +118,3 @@ func parseGroupVersionKind(s proto.Schema) []schema.GroupVersionKind {
return gvkListResult
}
// makeRawExtensionUntyped explicitly sets RawExtension's type in the schema to Untyped atomic
// TODO: remove this once kube-openapi is updated to include
// https://github.com/kubernetes/kube-openapi/pull/133
func makeRawExtensionUntyped(s *smdschema.Schema) *smdschema.Schema {
s2 := &smdschema.Schema{}
for _, t := range s.Types {
t2 := t
if t2.Name == "io.k8s.apimachinery.pkg.runtime.RawExtension" {
t2.Atom = smdschema.Atom{
Untyped: &smdschema.Untyped{},
}
}
s2.Types = append(s2.Types, t2)
}
return s2
}