Support Multi-stage install with Add-On's#4271
Merged
alpeb merged 7 commits intolinkerd:masterfrom Apr 23, 2020
Merged
Conversation
Signed-off-by: Tarun Pothulapati <[email protected]>
Pothulapati
requested review from
adleong,
alpeb and
zaharidichev
as code owners
Signed-off-by: Tarun Pothulapati <[email protected]>
Pothulapati
force-pushed
the
multi-stage
branch
4 times, most recently
from
6054c8d to
0aaf6e9
Compare
Signed-off-by: Tarun Pothulapati <[email protected]>
Pothulapati
force-pushed
the
multi-stage
branch
from
0aaf6e9 to
ade20c3
Compare
Signed-off-by: Tarun Pothulapati <[email protected]>
alpeb
reviewed
Apr 17, 2020
Member
alpeb
left a comment
alpeb
left a comment
There was a problem hiding this comment.
Great work @Pothulapati 👏
Awesome comprehensive tests 👍
I just have one comment.
Signed-off-by: Tarun Pothulapati <[email protected]>
Pothulapati
force-pushed
the
multi-stage
branch
from
80199cc to
9f9d2cf
Compare
Signed-off-by: Tarun Pothulapati <[email protected]>
Member
|
Thanks, @Pothulapati! Before I really dig into reviewing this, can you give me a bit more context on what it means? What about multi-stage install with add-on doesn't work today and how will it work once this is merged? |
Contributor
Author
|
@adleong Updated the PR description with that info. Feel free to comment, if I missed anything :) |
adleong
approved these changes
Apr 23, 2020
Member
adleong
left a comment
adleong
left a comment
There was a problem hiding this comment.
Thank you for the excellent PR description! LGTM!
alpeb
added a commit
that referenced
this pull request
Apr 23, 2020
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR add's support for multi stage install with add-ons. When we did the initial add-on model, Multi-stage wasn't supported as we had only one add-on and it was optional. This meant that users couldn't use multi-stage with add-ons i.e the full add-on manifests would be part of the
ControlPlaneStage. (noConfigStagefor addons)But now that we are adding grafana and prometheus as add-on's, It's important that all the things that are part of the install path are supported in the add-on model. This PR does this by separating the add-on template files into
ConfigStageTemplates()andControlPlaneStageTemplateswhich will be called based on the stage.Once this is merged, Users should be able to perform multi-stage normally along with
--addon-configflag to pass add-on configuration.Linkerd with Tracing add-on can be installed in multiple stages as follows:
Let
addons.yamlbeConfig Stage:
Control-Plane Stage:
This follows the usual requirement that, users must pass the same flags on both these stages.
Changes include:
Templates()withConfigStageTemplates(),ControlPlaneStageTemplates()func's in theaddOninterface, to separate out add-on template files.Signed-off-by: Tarun Pothulapati [email protected]