Revert "fix: support integer keys when marshaling resources to JSON"

This commit is contained in:
yugo kobayashi
2026-08-20 08:52:50 +09:00
committed by GitHub
parent db6d67b043
commit 35875a0b55
3 changed files with 14 additions and 31 deletions

View File

@@ -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.