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.

Sign up for GitHub

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

Update MSRV to v74 #239

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Update MSRV to v74 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kubert",
"image": "ghcr.io/linkerd/dev:v42",
"image": "ghcr.io/linkerd/dev:v43",
"runArgs": [
"--init",
// Use the host network so we can access k3d, etc.
Expand All @@ -26,6 +26,9 @@
"containerEnv": {
"CXX": "clang++-14",
},
"features": {
"ghcr.io/devcontainers/features/github-cli:1": {}
},
"customizations": {
"vscode": {
"extensions": [
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ permissions:
env:
CARGO_INCREMENTAL: 0
CARGO_NET_RETRY: 10
RUST_VERSION: 1.64.0
RUSTUP_MAX_RETRIES: 10
KUBERT_TEST_NS: kubert-test

Expand Down Expand Up @@ -44,9 +43,10 @@ jobs:
env:
KUBERT_TEST_CLUSTER_VERSION: ${{ matrix.k8s }}
steps:
- uses: linkerd/dev/actions/setup-tools@v42
- uses: linkerd/dev/actions/setup-rust@v42
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-rust@v43
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
- run: just fetch
- run: just --set features ${{ matrix.tls }} build-examples
- run: just --set features ${{ matrix.tls }} test-cluster-create
Expand Down Expand Up @@ -78,8 +78,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
KUBERT_TEST_CLUSTER_VERSION: ${{ matrix.k8s }}
steps:
- uses: linkerd/dev/actions/setup-tools@v42
- uses: linkerd/dev/actions/setup-rust@v42
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-rust@v43
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: just --set features ${{ matrix.tls }} build-examples-image
- run: just --set features ${{ matrix.tls }} test-cluster-create
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/features.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,18 @@ jobs:
strategy:
matrix:
rust:
- "1.65"
- "1.73"
- "1.74"
- "1.76"
timeout-minutes: 10
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v42
- uses: linkerd/dev/actions/setup-rust@v42
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-rust@v43
with:
version: ${{ matrix.rust }}
components: clippy
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
- run: just fetch
- run: just features=all clippy

Expand Down Expand Up @@ -70,8 +71,9 @@ jobs:
- shutdown
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
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
- run: just fetch
- run: just "features=${{ matrix.feature }}" clippy
5 changes: 3 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@ jobs:
fmt:
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- run: just fmt-check

doc:
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
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
- run: just fetch
- run: just doc

7 changes: 4 additions & 3 deletions .github/workflows/release-prometheus-process.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
meta:
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- id: meta
Expand Down Expand Up @@ -68,14 +68,15 @@ jobs:
uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564
with:
name: kubert-prometheus-process ${{ needs.meta.outputs.version }}
generate_release_notes: true
generate_release_notes: false
make_latest: false

crate:
# Only publish the crate after the rest of the release succeeds.
needs: [meta, release]
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: cargo publish --package=kubert-prometheus-process --dry-run
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release-prometheus-tokio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
meta:
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- id: meta
Expand Down Expand Up @@ -68,14 +68,15 @@ jobs:
uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564
with:
name: kubert-prometheus-tokio ${{ needs.meta.outputs.version }}
generate_release_notes: true
generate_release_notes: false
make_latest: false

crate:
# Only publish the crate after the rest of the release succeeds.
needs: [meta, release]
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
env:
RUSTFLAGS: '--cfg tokio_unstable'
RUSTDOCFLAGS: '--cfg tokio_unstable'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
meta:
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- id: meta
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
needs: [meta, release]
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v42-rust
container: ghcr.io/linkerd/dev:v43-rust
env:
RUSTFLAGS: '--cfg tokio_unstable'
RUSTDOCFLAGS: '--cfg tokio_unstable'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ jobs:
test:
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
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
- run: just fetch
- run: just test-build
- run: just test
2 changes: 1 addition & 1 deletion examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
publish = false
edition = "2021"
license = "Apache-2.0"
rust-version = "1.60"
rust-version = "1.74"

[package.metadata.release]
release = false
Expand Down
2 changes: 1 addition & 1 deletion examples/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linkerd/dev:v42-rust as build
FROM ghcr.io/linkerd/dev:v43-rust as build
WORKDIR /kubert
COPY . .
RUN --mount=type=cache,target=/usr/local/cargo/registry \
Expand Down
2 changes: 1 addition & 1 deletion kubert-prometheus-process/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
description = "A prometheus-client process metrics collector"
readme = "../README.md"
repository = "https://github.com/olix0r/kubert"
rust-version = "1.65"
rust-version = "1.74"
keywords = ["prometheus-client", "process", "metrics", "monitoring"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion kubert-prometheus-tokio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
description = "A prometheus-client tokio runtime metrics collector"
readme = "../README.md"
repository = "https://github.com/olix0r/kubert"
rust-version = "1.65"
rust-version = "1.74"
keywords = ["prometheus-client", "rokio", "metrics", "monitoring"]

[features]
Expand Down
2 changes: 1 addition & 1 deletion kubert/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
description = "Kubernetes runtime helpers. Based on kube-rs."
readme = "../README.md"
repository = "https://github.com/olix0r/kubert"
rust-version = "1.65"
rust-version = "1.74"
keywords = ["kubernetes", "client", "runtime", "server"]

[features]
Expand Down