Skip to content

[v0.17.x] internal/generate/olm-catalog: read only one manifest at a time #3043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2020
Merged

[v0.17.x] internal/generate/olm-catalog: read only one manifest at a time #3043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
373be84
internal/generate/olm-catalog: read only one manifest at a time from …
estroz May 12, 2020
0586186
Merge branch 'v0.17.x' into cherry-pick-3015-to-v0.17.x
estroz May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions changelog/fragments/get-csv-manifest-bugfix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# entries is a list of entries to include in
# release notes and/or the migration guide
entries:
- description: >
CSV manifests read from disk are now properly marshaled into the CSV struct

kind: "bugfix"

breaking: false
2 changes: 1 addition & 1 deletion internal/generate/olm-catalog/csv_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func getCSVFromDir(dir string) (*olmapiv1alpha1.ClusterServiceVersion, error) {
}
if typeMeta.Kind == olmapiv1alpha1.ClusterServiceVersionKind {
csv := &olmapiv1alpha1.ClusterServiceVersion{}
if err := yaml.Unmarshal(b, csv); err != nil {
if err := yaml.Unmarshal(manifest, csv); err != nil {
return nil, fmt.Errorf("error unmarshalling ClusterServiceVersion from manifest %s: %v", path, err)
}
return csv, nil
Expand Down