This repository has been archived by the owner on Nov 1, 2022. It is now read-only.
Fix patchFile-based manifest generation #2604
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
The problem was introduced at fluxcd#2565 Also, re-enable the manifest generation e2e test, which was disabled because of the bug fixed here.
squaremo
reviewed
Nov 12, 2019
| @@ -121,7 +121,7 @@ func (cf *ConfigFile) RelativeConfigPath() (string, error) { | |||
| // necessary) according to the config file. | |||
| func (cf *ConfigFile) GenerateManifests(ctx context.Context, manifests Manifests) ([]byte, error) { | |||
| if cf.PatchUpdated != nil { | |||
| finalBytes, _, _, err := cf.getGeneratedAndPatchedManifests(ctx, manifests) | |||
| _, finalBytes, _, err := cf.getGeneratedAndPatchedManifests(ctx, manifests) | |||
There was a problem hiding this comment.
shit happens! I didn't catch it during the review either
hiddeco
approved these changes
Nov 12, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The problem was introduced at #2565
Also, re-enable the manifest generation e2e test, which was disabled
because of the bug fixed here.
Fixes #2602