Skip to content
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

dev: v43 with Rust v1.76 #2703

Merged
merged 5 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"DEV_VERSION": "v42",
"DEV_VERSION": "v43",
"http_proxy": "${localEnv:http_proxy}",
"https_proxy": "${localEnv:https_proxy}"
}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: linkerd/dev/actions/setup-tools@v42
- uses: linkerd/dev/actions/setup-tools@v43
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: just action-lint

devcontainer-versions:
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v42
- uses: linkerd/dev/actions/setup-tools@v43
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: just action-dev-check
2 changes: 1 addition & 1 deletion .github/workflows/beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ permissions:
jobs:
build:
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
timeout-minutes: 20
continue-on-error: true
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
check-all:
timeout-minutes: 20
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-each.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
list-changed-crates:
timeout-minutes: 10
runs-on: ubuntu-latest
container: docker://ghcr.io/linkerd/dev:v42-rust
container: docker://ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -58,7 +58,7 @@ jobs:
needs: list-changed-crates
timeout-minutes: 20
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
strategy:
matrix:
crate: ${{ fromJson(needs.list-changed-crates.outputs.crates) }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
container:
image: docker://ghcr.io/linkerd/dev:v42-rust
image: docker://ghcr.io/linkerd/dev:v43-rust
options: --security-opt seccomp=unconfined # 🤷
env:
CXX: "/usr/bin/clang++-14"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
deprecated:
timeout-minutes: 20
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fuzzers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
list-changed:
timeout-minutes: 3
runs-on: ubuntu-latest
container: docker://rust:1.73.0
container: docker://rust:1.76.0
steps:
- run: apt update && apt install -y jo
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
Expand All @@ -48,7 +48,7 @@ jobs:
needs: [list-changed]
timeout-minutes: 40
runs-on: ubuntu-latest
container: docker://rust:1.73.0
container: docker://rust:1.76.0
strategy:
matrix:
dir: ${{ fromJson(needs.list-changed.outputs.dirs) }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
test:
timeout-minutes: 20
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/k8s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: linkerd/dev/actions/setup-tools@v42
- uses: linkerd/dev/actions/setup-tools@v43

- name: Install linkerd CLI (edge)
id: linkerd
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
clippy:
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -31,7 +31,7 @@ jobs:
fmt:
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -40,7 +40,7 @@ jobs:
docs:
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ permissions:
jobs:
build:
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
timeout-minutes: 20
continue-on-error: true
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
continue-on-error: ${{ !needs.meta.outputs.publish }}
runs-on: ubuntu-latest
timeout-minutes: 40
container: docker://ghcr.io/linkerd/dev:v42-rust-musl
container: docker://ghcr.io/linkerd/dev:v43-rust-musl
env:
LINKERD2_PROXY_VENDOR: ${{ github.repository_owner }}
LINKERD2_PROXY_VERSION: ${{ needs.meta.outputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v42
- uses: linkerd/dev/actions/setup-tools@v43
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: just sh-lint
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
meshtls:
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -43,7 +43,7 @@ jobs:
unit:
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:
jobs:
devcontainer:
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -37,7 +37,7 @@ jobs:
workflows:
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v42
- uses: linkerd/dev/actions/setup-tools@v43
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This is intended **DEVELOPMENT ONLY**, i.e. so that proxy developers can
# easily test the proxy in the context of the larger `linkerd2` project.

ARG RUST_IMAGE=ghcr.io/linkerd/dev:v42-rust
ARG RUST_IMAGE=ghcr.io/linkerd/dev:v43-rust

# Use an arbitrary ~recent edge release image to get the proxy
# identity-initializing and linkerd-await wrappers.
Expand Down
2 changes: 1 addition & 1 deletion linkerd/addr/src/addr_match.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::Addr;
use ipnet::IpNet;
use linkerd_dns_name::{Name, Suffix};
use std::{fmt, iter::FromIterator, net::IpAddr, sync::Arc};
use std::{fmt, net::IpAddr, sync::Arc};

#[derive(Clone, Debug, Default)]
pub struct AddrMatch {
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/admin/src/server/readiness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub struct Readiness(Weak<()>);

/// When all latches are dropped, the process is considered ready.
#[derive(Clone, Debug)]
pub struct Latch(Arc<()>);
pub struct Latch(#[allow(dead_code)] Arc<()>);

impl Readiness {
pub fn new() -> (Readiness, Latch) {
Expand Down
5 changes: 1 addition & 4 deletions linkerd/app/gateway/src/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ use linkerd_app_core::{
};
use linkerd_app_inbound as inbound;
use linkerd_app_outbound as outbound;
use std::{
cmp::{Eq, PartialEq},
fmt::Debug,
};
use std::fmt::Debug;
use tokio::sync::watch;

mod gateway;
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/inbound/src/direct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use linkerd_app_core::{
transport_header::{self, NewTransportHeaderServer, SessionProtocol, TransportHeader},
Conditional, Error, Infallible, NameAddr, Result,
};
use std::{convert::TryFrom, fmt::Debug};
use std::fmt::Debug;
use thiserror::Error;
use tracing::{debug_span, info_span};

Expand Down
5 changes: 1 addition & 4 deletions linkerd/app/inbound/src/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ pub mod fuzz {
use crate::{
http::router::Http,
policy,
test_util::{
support::{connect::Connect, http_util, profile, resolver},
*,
},
test_util::{support::connect::Connect, *},
Config, Inbound,
};
use hyper::{client::conn::Builder as ClientBuilder, Body, Request, Response};
Expand Down
3 changes: 0 additions & 3 deletions linkerd/app/integration/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ use super::*;
use linkerd_app_core::proxy::http::trace;
use parking_lot::Mutex;
use std::io;
use std::{convert::TryFrom, sync::Arc};
use tokio::net::TcpStream;
use tokio::sync::{mpsc, oneshot};
use tokio::task::JoinHandle;
use tokio_rustls::rustls::{self, ClientConfig};
use tracing::info_span;
use tracing::instrument::Instrument;

type ClientError = hyper::Error;
type Request = http::Request<hyper::Body>;
Expand Down
5 changes: 1 addition & 4 deletions linkerd/app/integration/src/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@ pub use linkerd2_proxy_api::destination as pb;
use linkerd2_proxy_api::net;
use linkerd_app_core::proxy::http::trace;
use parking_lot::Mutex;
use std::collections::{HashMap, VecDeque};
use std::collections::VecDeque;
use std::net::IpAddr;
use std::ops::{Bound, RangeBounds};
use std::sync::Arc;
use tokio::sync::mpsc;
use tokio_stream::wrappers::UnboundedReceiverStream;
use tonic as grpc;
use tracing::instrument::Instrument;

pub fn new() -> Controller {
Controller::new()
Expand Down
3 changes: 1 addition & 2 deletions linkerd/app/integration/src/identity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ use std::{
collections::VecDeque,
fs, io,
path::{Path, PathBuf},
sync::Arc,
time::{Duration, SystemTime},
time::SystemTime,
};

use linkerd2_proxy_api::identity as pb;
Expand Down
5 changes: 2 additions & 3 deletions linkerd/app/integration/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ mod tests;

pub use self::test_env::TestEnv;
pub use bytes::{Buf, BufMut, Bytes};
pub use futures::{future, FutureExt, TryFuture, TryFutureExt};

pub use futures::stream::{Stream, StreamExt};
pub use futures::{future, FutureExt, TryFuture, TryFutureExt};
pub use http::{HeaderMap, Request, Response, StatusCode};
pub use http_body::Body as HttpBody;
pub use linkerd_app as app;
Expand All @@ -43,7 +42,7 @@ use std::task::{Context, Poll};
pub use std::time::Duration;
pub use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf};
use tokio::net::TcpListener;
pub use tokio::sync::oneshot;
pub use tokio::sync::{mpsc, oneshot};
pub use tonic as grpc;
pub use tower::Service;

Expand Down
1 change: 0 additions & 1 deletion linkerd/app/integration/src/metrics.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::collections::HashMap;
use std::fmt;
use std::string::ToString;

#[derive(Debug, Clone)]
pub struct MetricMatch {
Expand Down
3 changes: 1 addition & 2 deletions linkerd/app/integration/src/policy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ use api::{inbound::inbound_server_policies_server, outbound::outbound_policies_s
use futures::stream;
use linkerd2_proxy_api as api;
use parking_lot::Mutex;
use std::{collections::VecDeque, sync::Arc, time::Duration};
use tokio::sync::mpsc;
use std::collections::VecDeque;
use tokio_stream::wrappers::UnboundedReceiverStream;
use tonic as grpc;

Expand Down
5 changes: 1 addition & 4 deletions linkerd/app/integration/src/proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ use linkerd_app_core::{
transport::{listen, orig_dst, Keepalive, ListenAddr},
Result,
};
use std::{
collections::HashSet, fmt, future::Future, net::SocketAddr, pin::Pin, task::Poll, thread,
};
use std::{collections::HashSet, thread};
use tokio::net::TcpStream;
use tracing::instrument::Instrument;

pub fn new() -> Proxy {
Proxy::default()
Expand Down
9 changes: 1 addition & 8 deletions linkerd/app/integration/src/server.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
use super::*;
use futures::TryFuture;
use linkerd_app_core::proxy::http::trace;
use std::{
collections::HashMap,
future::Future,
io,
pin::Pin,
sync::atomic::{AtomicUsize, Ordering},
sync::Arc,
task::{Context, Poll},
};
use tokio::{net::TcpStream, sync::oneshot, task::JoinHandle};
use tokio::{net::TcpStream, task::JoinHandle};
use tokio_rustls::{rustls::ServerConfig, TlsAcceptor};
use tracing::instrument::Instrument;

pub fn new() -> Server {
http2()
Expand Down
5 changes: 0 additions & 5 deletions linkerd/app/integration/src/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@ use super::*;
use std::collections::VecDeque;
use std::io;
use std::net::TcpListener as StdTcpListener;
use std::pin::Pin;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tokio::net::TcpStream;
use tokio::sync::{mpsc, oneshot};
use tokio::task::JoinHandle;
use tracing::instrument::Instrument;

type TcpConnSender = mpsc::UnboundedSender<(
Option<Vec<u8>>,
Expand Down
Loading
Loading