mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-09-15 04:12:43 +00:00
Revert "fix: support integer keys when marshaling resources to JSON"
This commit is contained in:
@@ -17,7 +17,6 @@ import (
|
||||
"sigs.k8s.io/kustomize/kyaml/sliceutil"
|
||||
"sigs.k8s.io/kustomize/kyaml/utils"
|
||||
"sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/labels"
|
||||
k8syaml "sigs.k8s.io/yaml"
|
||||
)
|
||||
|
||||
// MakeNullNode returns an RNode that represents an empty document.
|
||||
@@ -984,11 +983,20 @@ func (rn *RNode) MarshalJSON() ([]byte, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
b, err := k8syaml.YAMLToJSONStrict([]byte(s))
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err)
|
||||
if yNode.Kind == SequenceNode {
|
||||
var a []interface{}
|
||||
if err := Unmarshal([]byte(s), &a); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return json.Marshal(a)
|
||||
}
|
||||
return b, nil
|
||||
|
||||
m := map[string]interface{}{}
|
||||
if err := Unmarshal([]byte(s), &m); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return json.Marshal(m)
|
||||
}
|
||||
|
||||
// UnmarshalJSON overwrites this RNode with data from []byte.
|
||||
|
||||
Reference in New Issue
Block a user