Introduce inject check for known sidecars#1619
Merged
Conversation
5 tasks
siggy
force-pushed
the
siggy/inject-udp
branch
from
bbf5dfb to
fae1560
Compare
siggy
force-pushed
the
siggy/inject-known-sidecars
branch
from
a7b114f to
ea84e8a
Compare
siggy
force-pushed
the
siggy/inject-known-sidecars
branch
from
ea84e8a to
75bda7b
Compare
rmars
approved these changes
Sep 11, 2018
cli/cmd/inject.go
Outdated
| if len(sidecar) > 1 { | ||
| verb = "use" | ||
| } | ||
| output.Write([]byte(fmt.Sprintf("%s%s -- %s %s known sidecar\n", sidecarPrefix, warnStatus, strings.Join(sidecar, ", "), verb))) |
There was a problem hiding this comment.
TIOLI you could use the text known sidecar detected in strings.Join(sidecar, ", ") (or known sidecar already present in ...) to avoid having the use/uses.
klingerf
approved these changes
Sep 11, 2018
Contributor
klingerf
left a comment
klingerf
left a comment
There was a problem hiding this comment.
⭐️ Nice, looks good to me, but frankly I don't know enough about Contour to know if it's something we could work with or not.
`linkerd inject` was not checking its input for known sidecars and initContainers. Modify `linkerd inject` to check for existing sidecars and initContainers, specifically, Linkerd, Istio, and Contour. Part of #1516 Signed-off-by: Andrew Seigner <[email protected]>
siggy
force-pushed
the
siggy/inject-known-sidecars
branch
from
75bda7b to
7858c95
Compare
zachalbert
added a commit
to zachalbert/linkerd2
that referenced
this pull request
Sep 13, 2018
* master: Update CHANGES.md for v18.9.1 release (linkerd#1631) Cleanly shutdown tap stream to data plane proxies (linkerd#1624) Change breadcrumb header to default font in styles.css (linkerd#1633) Improve top table to better cope with high RPS traffic (linkerd#1634) Add small success rate chart to table, misc web tweaks (linkerd#1628) Consolidate the source and destination columns in the Tap and Top tables (linkerd#1620) remove extraneous calc function in sidebar.css (linkerd#1632) Display more helpful websocket errors (linkerd#1626) Add breadcrumb navigation at the top of linkerd dashboard (linkerd#1613) Introduce inject check for known sidecars (linkerd#1619) Bump Prometheus to v2.4.0, Grafana to 5.2.4 (linkerd#1625) Improve performance of tap table by throttling updates (linkerd#1623) Add with-source flag to top (linkerd#1614) Conflicts: web/app/css/styles.css web/app/js/components/ResourceDetail.jsx web/app/js/index.js
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.
linkerd injectwas not checking its input for known sidecars andinitContainers.
Modify
linkerd injectto check for existing sidecars andinitContainers, specifically, Linkerd, Istio, and Contour.
Part of #1516
Signed-off-by: Andrew Seigner [email protected]
Depends on #1617