Use cniPluginVersion with Helm for linkerd2-cni#4693
Merged
Pothulapati merged 3 commits intomainfrom Jul 2, 2020
Merged
Conversation
use cliVersionVariable as version with Helm, which is overriden by cliVersion when used with Helm Signed-off-by: Tarun Pothulapati <[email protected]>
Signed-off-by: Tarun Pothulapati <[email protected]>
Signed-off-by: Tarun Pothulapati <[email protected]>
Pothulapati
commented
Jul 1, 2020
| k8s-app: linkerd-cni | ||
| linkerd.io/cni-resource: "true" | ||
| annotations: | ||
| linkerd.io/created-by: linkerd/cli dev-undefined |
Contributor
Author
There was a problem hiding this comment.
Hmmm, From what I understood, dev-undefined is our fallback when there is no version tag is specified. and whats where we fallback when cliVersion is empty but should we be okay with having tests using this? especially the helm ones as there we can't fall back to this?
alpeb
approved these changes
Jul 1, 2020
Member
alpeb
left a comment
alpeb
left a comment
There was a problem hiding this comment.
Yeah, dev-undefined should be fine for tests 👍
Merged
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.
Fixes #4691
As
cliVersionfield is not present when the installation is done through Helm, default tocniVersionValuewhen it is not present.Signed-off-by: Tarun Pothulapati [email protected]