Skip to content
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.

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

Fix firing shots including resources with labels #115

Merged
merged 1 commit into from
Oct 29, 2019

Conversation

kke
Copy link
Contributor

@kke kke commented Oct 22, 2019

Fixes #113

Config#labels always returns a RecursiveOpenStruct
resource.merge raises unless merging a hash at least since kontena/k8s-client#81 (v0.8.0)

This breaks mortar if any of the resources include metadata: labels:.

Fixed by converting the labels struct to a hash before merging.

@kke kke added the bug Something isn't working label Oct 22, 2019
@kke kke requested a review from jakolehm October 22, 2019 09:24
@kke kke merged commit 709459e into master Oct 29, 2019
@kke kke deleted the fix/deep_merge_recursive_open_struct branch October 29, 2019 08:39
@kke kke mentioned this pull request Oct 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to deploy config map
2 participants