Skip to content

Commit 41598d8

Browse files
committed
fix: write yaml separator before manifsts
1 parent 803cc28 commit 41598d8

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

internal/parser/parser.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ func (p *Parser) Run(ctx context.Context, in io.Reader) error {
6767
return nil
6868
}
6969

70+
_, errNewLine := p.Output.Write([]byte("---\n"))
7071
err := p.Printer.PrintObj(obj, p.Output)
71-
if err != nil {
72+
73+
if err != nil || errNewLine != nil {
7274
p.Logger.Error(err, "failed to write manifests to output")
7375
return abort(err)
7476
}
@@ -205,6 +207,10 @@ func (p *Parser) unpack(pkg *crossplanev1.Provider) ([]byte, error) {
205207
}
206208

207209
layers, err := ociImage.Layers()
210+
if err != nil {
211+
return nil, err
212+
}
213+
208214
for _, layer := range layers {
209215
contents, err := layer.Uncompressed()
210216
if err != nil {

internal/xcrd/crd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
30-
"k8s.io/utils/pointer"
30+
"k8s.io/utils/ptr"
3131

3232
"github.com/crossplane/crossplane-runtime/pkg/errors"
3333
"github.com/crossplane/crossplane-runtime/pkg/meta"
@@ -130,7 +130,7 @@ func genCrdVersion(vr v1.CompositeResourceDefinitionVersion) (*extv1.CustomResou
130130
Name: vr.Name,
131131
Served: vr.Served,
132132
Storage: vr.Referenceable,
133-
Deprecated: pointer.BoolDeref(vr.Deprecated, false),
133+
Deprecated: ptr.Deref(vr.Deprecated, false),
134134
DeprecationWarning: vr.DeprecationWarning,
135135
AdditionalPrinterColumns: vr.AdditionalPrinterColumns,
136136
Schema: &extv1.CustomResourceValidation{

0 commit comments

Comments
 (0)