Skip to content

Controller fails on empty manifest files from a Helm Chart. #2831

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
bharathi-tenneti merged 4 commits into from
Apr 13, 2020
Merged

Controller fails on empty manifest files from a Helm Chart. #2831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef12c86
Check for empty gvk
bharathi-tenneti Apr 8, 2020
2d94d23
Check for empty gvk
bharathi-tenneti Apr 8, 2020
54b94ed
Reverted to %w
bharathi-tenneti Apr 13, 2020
6606445
Added CHANGELOG entry
bharathi-tenneti Apr 13, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
- `operator-sdk generate csv` and `operator-sdk test local` now parse multi-manifest files correctly. ([#2758](https://github.com/operator-framework/operator-sdk/pull/2758))
- Fixed CRD validation generation issue with `status.Conditions`. ([#2739](https://github.com/operator-framework/operator-sdk/pull/2739))
- Fix issue faced in the reconciliation when arrays are used in the config YAML files for Helm based-operators. ([#2777](https://github.com/operator-framework/operator-sdk/pull/2777))
- Fixed issue in helm-operator where empty resource in release manifest caused failures while setting up watches for dependent resources. ([#2831](https://github.com/operator-framework/operator-sdk/pull/2831))


## v0.16.0

Expand Down
3 changes: 3 additions & 0 deletions pkg/helm/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ func watchDependentResources(mgr manager.Manager, r *HelmOperatorReconciler, c c
}

gvk := u.GroupVersionKind()
if gvk.Empty() {
continue
}
m.RLock()
_, ok := watches[gvk]
m.RUnlock()
Expand Down