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

Merge pull request #106268 from philipatl/edit-json-merge-patch-fix 

fix edit of non-registered custom API types

Kubernetes-commit: a4d5be8c220a50afa62203f04130f056fa2826cd
This commit is contained in:
Kubernetes Publisher 2021-11-16 06:41:26 -08:00
parent dd304ca4d8 7da3d10e34
commit 3bbec9b31e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/cmd/util/editor/editoptions.go
View File

@ -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")
}