-
Notifications
You must be signed in to change notification settings - Fork 270
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pin git deps for dependencies that have Instant
workarounds
#1497
Conversation
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>
2273f13
to
2771320
Compare
Signed-off-by: Oliver Gould <ver@buoyant.io>
cc131b8
to
495a51a
Compare
The |
Dockerfile
Outdated
# 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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what's the story behind this change? looks unrelated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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>
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)
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)
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.