Replace broken mergo version #172
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hiddeco
reviewed
Dec 4, 2020
hiddeco
reviewed
Dec 4, 2020
go.mod
Outdated
| @@ -3,6 +3,8 @@ module github.com/fluxcd/helm-controller | |||
| go 1.15 | |||
|
|
|||
| replace github.com/fluxcd/helm-controller/api => ./api | |||
| # TODO: Remove once we move to a controller-runtime version which doesn't use this version. | |||
There was a problem hiding this comment.
Suggested change
| # TODO: Remove once we move to a controller-runtime version which doesn't use this version. | |
| // TODO: Remove once we move to a controller-runtime version which doesn't use this version. |
Replace mergo version used by controller-runtime which is broken [0], until we can move to controller-runtime 0.7.0 which no longer uses this version. Fixes fluxcd#152 [0]: darccio/mergo#139 Signed-off-by: Sean Eagan <seaneagan1@gmail.com>
seaneagan
force-pushed
the
fix-mergo-version
branch
from
a1fd7d1
to
bb47c17
Compare
hiddeco
approved these changes
Dec 4, 2020
airshipbot
pushed a commit
to airshipit/airshipctl
that referenced
this pull request
Jan 8, 2021
This updates the Flux manifests to the latest versions, which includes a fix [0] to Helm chart rendering which was impacting the OSH charts. [0]: fluxcd/helm-controller#172 This also adds Kptfiles to each of the functions to make it trivial to update them. Relates-To: #430 Change-Id: Ic12bc6a8460542fd943ed3539cf1be19b6525dbc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replace mergo version used by controller-runtime which is broken 0,
until we can move to controller-runtime 0.7.0 which no longer uses this version.
Fixes #152