github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
fix edit of non-registered custom API types
This commit is contained in:
Kubernetes Prow Robot 2021-11-16 06:41:26 -08:00 committed by GitHub
commit a4d5be8c22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go
View File

@ -19,6 +19,7 @@ package editor
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"io" "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) klog.V(4).Infof("Unable to calculate diff, no merge is possible: %v", err)
return 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 { for _, precondition := range preconditions {
if !precondition(patch) { if !precondition(patchMap) {
klog.V(4).Infof("Unable to calculate diff, no merge is possible: %v", err) 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") return fmt.Errorf("%s", "At least one of apiVersion, kind and name was changed")
} }