From b7cccfe1154a14b58e8dbe9f5039f031809d91e7 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Thu, 17 Jan 2019 16:22:30 -0800 Subject: [PATCH] Update code for newest smd changes --- .../handlers/fieldmanager/internal/gvkparser.go | 2 +- .../fieldmanager/internal/typeconverter.go | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go index ce9a0492445..14d90f964f1 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go @@ -35,7 +35,7 @@ type gvkParser struct { parser typed.Parser } -func (p *gvkParser) Type(gvk schema.GroupVersionKind) *typed.ParseableType { +func (p *gvkParser) Type(gvk schema.GroupVersionKind) typed.ParseableType { typeName, ok := p.gvks[gvk] if !ok { return nil diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter.go index 79f3017cb43..9b149b32221 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter.go @@ -21,7 +21,6 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kube-openapi/pkg/util/proto" "sigs.k8s.io/structured-merge-diff/typed" "sigs.k8s.io/yaml" @@ -30,7 +29,6 @@ import ( // TypeConverter allows you to convert from runtime.Object to // typed.TypedValue and the other way around. type TypeConverter interface { - NewTyped(schema.GroupVersionKind) (typed.TypedValue, error) ObjectToTyped(runtime.Object) (typed.TypedValue, error) YAMLToTyped([]byte) (typed.TypedValue, error) TypedToObject(typed.TypedValue) (runtime.Object, error) @@ -53,19 +51,6 @@ func NewTypeConverter(models proto.Models) (TypeConverter, error) { return &typeConverter{parser: parser}, nil } -func (c *typeConverter) NewTyped(gvk schema.GroupVersionKind) (typed.TypedValue, error) { - t := c.parser.Type(gvk) - if t == nil { - return typed.TypedValue{}, fmt.Errorf("no corresponding type for %v", gvk) - } - - u, err := t.New() - if err != nil { - return typed.TypedValue{}, fmt.Errorf("new typed: %v", err) - } - return u, nil -} - func (c *typeConverter) ObjectToTyped(obj runtime.Object) (typed.TypedValue, error) { u, err := runtime.DefaultUnstructuredConverter.ToUnstructured(obj) if err != nil {