diff --git a/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go b/pkg/endpoints/handlers/fieldmanager/gvkparser.go similarity index 94% rename from pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go rename to pkg/endpoints/handlers/fieldmanager/gvkparser.go index f8abcaf04..b30c423ab 100644 --- a/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go +++ b/pkg/endpoints/handlers/fieldmanager/gvkparser.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package internal +package fieldmanager import ( "fmt" @@ -65,11 +65,15 @@ func NewGVKParser(models proto.Models, preserveUnknownFields bool) (*GvkParser, panic(fmt.Sprintf("ListModels returns a model that can't be looked-up for: %v", modelName)) } gvkList := parseGroupVersionKind(model) + //fmt.Println("+++") + //fmt.Printf("gvkList = %+v\n", gvkList) + //fmt.Println("+++") for _, gvk := range gvkList { if len(gvk.Kind) > 0 { _, ok := parser.gvks[gvk] if ok { - return nil, fmt.Errorf("duplicate entry for %v", gvk) + //return nil, fmt.Errorf("duplicate entry for %v", gvk) + fmt.Printf("duplicate entry for %v\n", gvk) } parser.gvks[gvk] = modelName } diff --git a/pkg/endpoints/handlers/fieldmanager/typeconverter.go b/pkg/endpoints/handlers/fieldmanager/typeconverter.go index 8bb2f0c9e..6f4c2b550 100644 --- a/pkg/endpoints/handlers/fieldmanager/typeconverter.go +++ b/pkg/endpoints/handlers/fieldmanager/typeconverter.go @@ -22,7 +22,6 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal" "k8s.io/kube-openapi/pkg/util/proto" "sigs.k8s.io/structured-merge-diff/v4/typed" "sigs.k8s.io/structured-merge-diff/v4/value" @@ -65,7 +64,7 @@ func (DeducedTypeConverter) TypedToObject(value *typed.TypedValue) (runtime.Obje } type typeConverter struct { - parser *internal.GvkParser + parser *GvkParser } var _ TypeConverter = &typeConverter{} @@ -74,7 +73,7 @@ var _ TypeConverter = &typeConverter{} // will automatically find the proper version of the object, and the // corresponding schema information. func NewTypeConverter(models proto.Models, preserveUnknownFields bool) (TypeConverter, error) { - parser, err := internal.NewGVKParser(models, preserveUnknownFields) + parser, err := NewGVKParser(models, preserveUnknownFields) if err != nil { return nil, err }