From e583f199b84e3e0953cb0eb016b930b534a1004f Mon Sep 17 00:00:00 2001 From: Katrina Verey Date: Wed, 30 Jun 2021 10:18:11 -0700 Subject: [PATCH] Comment out part of script that is likely only needed on first run --- kyaml/internal/forked/update-go-yaml.sh | 5 +++-- kyaml/yaml/alias.go | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kyaml/internal/forked/update-go-yaml.sh b/kyaml/internal/forked/update-go-yaml.sh index 36be7688e..4eef38738 100755 --- a/kyaml/internal/forked/update-go-yaml.sh +++ b/kyaml/internal/forked/update-go-yaml.sh @@ -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 git commit --all -m "Internalize forked code" -explain "Cherry-picking the commits from our test fixes in Kustomize PR" -cherry-pick https://github.com/kubernetes-sigs/kustomize $KUSTOMIZE_PR +# This is only necessary in the initial forking of the code +# explain "Cherry-picking the commits from our test fixes in Kustomize PR" +# cherry-pick https://github.com/kubernetes-sigs/kustomize $KUSTOMIZE_PR explain "SUCCEEDED." exit 0 diff --git a/kyaml/yaml/alias.go b/kyaml/yaml/alias.go index 018869041..05cafae0d 100644 --- a/kyaml/yaml/alias.go +++ b/kyaml/yaml/alias.go @@ -30,6 +30,7 @@ type Node = yaml.Node type Style = yaml.Style type TypeError = yaml.TypeError type Unmarshaler = yaml.Unmarshaler + var Marshal = func(in interface{}) ([]byte, error) { var buf bytes.Buffer err := NewEncoder(&buf).Encode(in)