kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Comment out part of script that is likely only needed on first run

Browse Source
This commit is contained in:
Katrina Verey
2021-06-30 10:18:11 -07:00
parent b465c20f65
commit e583f199b8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kyaml/internal/forked/update-go-yaml.sh
View File

@@ -99,8 +99,9 @@ find kyaml/internal/forked/github.com/go-yaml/yaml -name "*.go" -type f | xargs
rm kyaml/internal/forked/github.com/go-yaml/yaml/go.mod rm kyaml/internal/forked/github.com/go-yaml/yaml/go.mod
git commit --all -m "Internalize forked code" git commit --all -m "Internalize forked code"
explain "Cherry-picking the commits from our test fixes in Kustomize PR" # This is only necessary in the initial forking of the code
cherry-pick https://github.com/kubernetes-sigs/kustomize $KUSTOMIZE_PR # explain "Cherry-picking the commits from our test fixes in Kustomize PR"
# cherry-pick https://github.com/kubernetes-sigs/kustomize $KUSTOMIZE_PR
explain "SUCCEEDED." explain "SUCCEEDED."
exit 0 exit 0

1
kyaml/yaml/alias.go
View File

@@ -30,6 +30,7 @@ type Node = yaml.Node
type Style = yaml.Style type Style = yaml.Style
type TypeError = yaml.TypeError type TypeError = yaml.TypeError
type Unmarshaler = yaml.Unmarshaler type Unmarshaler = yaml.Unmarshaler
var Marshal = func(in interface{}) ([]byte, error) { var Marshal = func(in interface{}) ([]byte, error) {
var buf bytes.Buffer var buf bytes.Buffer
err := NewEncoder(&buf).Encode(in) err := NewEncoder(&buf).Encode(in)