Pin git deps for dependencies that have Instant workarounds
#1497
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
tokio & tower have been patched to avoid issues described in linkerd/linkerd2#7748, but they have not yet been released. This change pins these dependencies to Git to pickup the workarounds. Signed-off-by: Oliver Gould <ver@buoyant.io>
olix0r
force-pushed
the
ver/pin-deps-for-instant-fixes
branch
from
2273f13 to
2771320
Compare
Signed-off-by: Oliver Gould <ver@buoyant.io>
olix0r
force-pushed
the
ver/pin-deps-for-instant-fixes
branch
from
cc131b8 to
495a51a
Compare
hawkw
approved these changes
Feb 15, 2022
|
The |
hawkw
reviewed
Feb 15, 2022
Dockerfile
Outdated
Comment on lines
64
to
75
| # When set, causes the proxy to remove the identity wrapper responsible for | ||
| # CSR and key generation. | ||
| ARG SKIP_IDENTITY_WRAPPER | ||
|
|
||
| WORKDIR /linkerd | ||
| COPY --from=build /out/linkerd2-proxy /usr/lib/linkerd/linkerd2-proxy | ||
| ENV LINKERD2_PROXY_LOG=warn,linkerd=info | ||
| RUN \ | ||
| if [ -n "$SKIP_IDENTITY_WRAPPER" ] ; then \ | ||
| rm -f /usr/bin/linkerd2-proxy-run && \ | ||
| ln /usr/lib/linkerd/linkerd2-proxy /usr/bin/linkerd2-proxy-run ; \ | ||
| fi |
There was a problem hiding this comment.
what's the story behind this change? looks unrelated
There was a problem hiding this comment.
#1479 changed the base image to not include a shell, so it wasn't possible to build the dockerfile without this. I'll back this out and put up a separate PR for the change
There was a problem hiding this comment.
ah, got it --- merging it in a separate PR is probably better, but mainly, i just wasn't sure what was changing here.
Signed-off-by: Oliver Gould <ver@buoyant.io>
olix0r
added a commit
to linkerd/linkerd2
that referenced
this pull request
Feb 15, 2022
This release updates the `tokio` and `tower` crates to unreleased versions to pickup workarounds for `Instant`-related panics that occur on Amazon Linux. This release also updates the proxy's configuration logic to stop logging errors when the inbound port configuration is empty. --- * build(deps): bump rustls from 0.20.2 to 0.20.3 (linkerd/linkerd2-proxy#1495) * build(deps): bump serde_json from 1.0.78 to 1.0.79 (linkerd/linkerd2-proxy#1494) * build(deps): bump hdrhistogram from 7.4.0 to 7.5.0 (linkerd/linkerd2-proxy#1493) * ci: Use cargo-action-fmt to annotate PRs (linkerd/linkerd2-proxy#1492) * Do not error when `LINKERD2_PROXY_INBOUND_PORTS` is empty (linkerd/linkerd2-proxy#1478) * build(deps): bump EmbarkStudios/cargo-deny-action from 1.2.11 to 1.2.12 (linkerd/linkerd2-proxy#1499) * Fix dockerfile (linkerd/linkerd2-proxy#1500) * Pin git deps for dependencies that have `Instant` workarounds (linkerd/linkerd2-proxy#1497)
olix0r
added a commit
to linkerd/linkerd2
that referenced
this pull request
Feb 15, 2022
This release updates the `tokio` and `tower` crates to unreleased versions to pickup workarounds for `Instant`-related panics that occur on Amazon Linux. This release also updates the proxy's configuration logic to stop logging errors when the inbound port configuration is empty. --- * build(deps): bump rustls from 0.20.2 to 0.20.3 (linkerd/linkerd2-proxy#1495) * build(deps): bump serde_json from 1.0.78 to 1.0.79 (linkerd/linkerd2-proxy#1494) * build(deps): bump hdrhistogram from 7.4.0 to 7.5.0 (linkerd/linkerd2-proxy#1493) * ci: Use cargo-action-fmt to annotate PRs (linkerd/linkerd2-proxy#1492) * Do not error when `LINKERD2_PROXY_INBOUND_PORTS` is empty (linkerd/linkerd2-proxy#1478) * build(deps): bump EmbarkStudios/cargo-deny-action from 1.2.11 to 1.2.12 (linkerd/linkerd2-proxy#1499) * Fix dockerfile (linkerd/linkerd2-proxy#1500) * Pin git deps for dependencies that have `Instant` workarounds (linkerd/linkerd2-proxy#1497)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
tokio & tower have been patched to avoid issues described in
linkerd/linkerd2#7748, but they have not yet been released. This change
pins these dependencies to Git to pickup the workarounds.