This repository has been archived by the owner on Mar 24, 2023. It is now read-only.
Ship unfork #735
Merged
Ship unfork #735
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
Rob0h
reviewed
Dec 1, 2018
| @@ -121,3 +136,64 @@ func CompareDir(expected, actual string, replacements map[string]string) (bool, | |||
|
|
|||
| return true, nil | |||
| } | |||
|
|
|||
| func prettyAndCleanJSON(data []byte, keysToIgnore []string) []byte { | |||
There was a problem hiding this comment.
do we still want this and modifyField ?
There was a problem hiding this comment.
Removed modifyField. Left this pulled out of the CompareDir for now, it was repeated, so /shrug. It's probably better to be out?
Rob0h
reviewed
Dec 1, 2018
pkg/lifecycle/unfork/daemonless.go
Outdated
| Logger: logger, | ||
| FS: fs, | ||
| State: state, | ||
| Patcher: patch.ShipPatcher{ |
There was a problem hiding this comment.
this can also be DI'd v.s. creating another instance
Rob0h
approved these changes
Dec 1, 2018
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.
What I Did
Add a new "unfork" command to Ship. This takes two parameters: a URL to a forked/copied Helm chart, and a URL to an upstream Helm chart. Ship will run (in headless mode) to create Kustomize patches from the fork, so that the upstream helm chart can be used directly again. The values.yaml from the fork will be used when running Helm template against both charts.
How I Did it
Modified Ship to support a new, default Unfork lifecycle. The "ship unfork" command always invokes this. This only works with 2 a forked Helm chart today. Used the existing CreateTwoWayStrategicMergePatch functionality.
How to verify it
Run the integration tests. Or:
Description for the Changelog
Add
ship unforkcommand to create patches from an existing fork.Picture of a Boat (not required but encouraged)