From e1520fcf9e249cccd64f9991b48972467eb36bd8 Mon Sep 17 00:00:00 2001 From: Rob Scott Date: Wed, 29 Sep 2021 08:44:05 -0700 Subject: [PATCH] Updating WriteYAML to not add delimiter to start files --- pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml | 2 -- pkg/crd/testdata/gen/bar.example.com_foos.yaml | 2 -- pkg/genall/genall.go | 8 ++++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml b/pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml index 11b2c7c2d..249c400fd 100644 --- a/pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml +++ b/pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/pkg/crd/testdata/gen/bar.example.com_foos.yaml b/pkg/crd/testdata/gen/bar.example.com_foos.yaml index 7fe830f29..dd70f4785 100644 --- a/pkg/crd/testdata/gen/bar.example.com_foos.yaml +++ b/pkg/crd/testdata/gen/bar.example.com_foos.yaml @@ -1,5 +1,3 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/pkg/genall/genall.go b/pkg/genall/genall.go index 2cf4ec7e7..19c9cda40 100644 --- a/pkg/genall/genall.go +++ b/pkg/genall/genall.go @@ -130,12 +130,16 @@ func (g GenerationContext) WriteYAML(itemPath string, objs ...interface{}) error } defer out.Close() - for _, obj := range objs { + for i, obj := range objs { yamlContent, err := yaml.Marshal(obj) if err != nil { return err } - n, err := out.Write(append([]byte("\n---\n"), yamlContent...)) + delimiter := "" + if i > 0 { + delimiter = "\n---\n" + } + n, err := out.Write(append([]byte(delimiter), yamlContent...)) if err != nil { return err }