From e07a6c9e523c11509f3264ad1ef2ea381709a29c Mon Sep 17 00:00:00 2001 From: Philip Hamer Date: Tue, 9 Nov 2021 10:06:03 -0500 Subject: [PATCH] fix edit of non-registered custom API types --- .../k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go b/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go index b63f1d3212e..cc32e59434a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go @@ -19,6 +19,7 @@ package editor import ( "bufio" "bytes" + "encoding/json" "errors" "fmt" "io" @@ -667,8 +668,14 @@ func (o *EditOptions) visitToPatch(originalInfos []*resource.Info, patchVisitor klog.V(4).Infof("Unable to calculate diff, no merge is possible: %v", err) return err } + var patchMap map[string]interface{} + err = json.Unmarshal(patch, &patchMap) + if err != nil { + klog.V(4).Infof("Unable to calculate diff, no merge is possible: %v", err) + return err + } for _, precondition := range preconditions { - if !precondition(patch) { + if !precondition(patchMap) { klog.V(4).Infof("Unable to calculate diff, no merge is possible: %v", err) return fmt.Errorf("%s", "At least one of apiVersion, kind and name was changed") }