From 3afb63e414ee5df7ad7bfbb839cd33661be532ca Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Tue, 12 Feb 2019 12:25:21 -0800 Subject: [PATCH] Revert "Temporary fix for alpha features test" Kubernetes-commit: 845e44dd207fc3793f8bab1b69665a816f966489 --- .../fieldmanager/internal/gvkparser.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go b/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go index 1028a81b1..929f1e79a 100644 --- a/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go +++ b/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go @@ -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 -}