Skip to content

Commit d572d6b

Browse files
authored
build(deps): update to kube 0.78 and k8s-openapi 0.17 (#42)
This branch updates the dependency on `kube` to v0.78 and the dependency on `k8s-openapi` to 0.17. Since these dependencies have to be updated together, the Dependabot PRs for the update don't compile. Therefore, this PR closes #37 and #36. It was also necessary to update the devcontainer to the latest version, as `dev:v34` can no longer build the latest `openssl-sys` (a dependency of `kube-runtime`). The CI `integration` workflow was also updated to test against the latest Kubernetes version (v1.26).
1 parent 9dc1afb commit d572d6b

File tree

7 files changed

+21
-35
lines changed

7 files changed

+21
-35
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "k8s-gateway-api",
3-
"image": "ghcr.io/linkerd/dev:v34",
3+
"image": "ghcr.io/linkerd/dev:v39",
44
"extensions": [
55
"DavidAnson.vscode-markdownlint",
66
"kokakiwi.vscode-just",
@@ -26,4 +26,4 @@
2626
"type": "bind"
2727
}
2828
]
29-
}
29+
}

.github/workflows/actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
actionlint:
1414
runs-on: ubuntu-20.04
1515
timeout-minutes: 10
16-
container: ghcr.io/linkerd/dev:v34-action
1716
steps:
1817
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
18+
- uses: linkerd/dev/actions/setup-tools@v39
1919
- run: just-dev lint-actions
2020

2121
devcontainer-versions:
2222
runs-on: ubuntu-latest
23-
container: ghcr.io/linkerd/dev:v34-action
2423
steps:
2524
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
25+
- uses: linkerd/dev/actions/setup-tools@v39
2626
- run: just-dev check-action-images

.github/workflows/integration.yml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,20 @@ jobs:
2727
k8s:
2828
- v1.21
2929
- v1.25
30+
- v1.26
3031
timeout-minutes: 10
3132
runs-on: ubuntu-latest
33+
env:
34+
K8S_CHANNEL: ${{ matrix.k8s }}
3235
steps:
33-
# TODO(ver) Figure out how to use tools from the dev image.
34-
- name: Install rust
35-
run: |
36-
rm -rf "$HOME/.cargo"
37-
curl --proto =https --tlsv1.3 -fLsSv https://sh.rustup.rs | sh -s -- -y --default-toolchain "${RUST_VERSION}"
38-
source "$HOME/.cargo/env"
39-
echo "PATH=$PATH" >> "$GITHUB_ENV"
40-
cargo version
41-
- name: Install cargo-nextest
42-
run: |
43-
url="https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-${NEXTEST_VERSION}/cargo-nextest-${NEXTEST_VERSION}-x86_64-unknown-linux-gnu.tar.gz" ; \
44-
curl --proto =https --tlsv1.3 -LsSv "$url" | tar zvxf - -C /usr/local/bin cargo-nextest
45-
- name: Install dev utils
46-
run: |
47-
sha=574d6bab940a5fcfcd49169cd0b24ee72e2b5a04 # dev:v34
48-
cd /usr/local/bin
49-
for util in cargo k3d ; do
50-
curl --proto =https --tlsv1.3 -fLsSvO "https://raw.githubusercontent.com/linkerd/dev/$sha/bin/just-$util"
51-
chmod 755 "/usr/local/bin/just-$util"
52-
done
53-
- uses: extractions/setup-just@95b912dc5d3ed106a72907f2f9b91e76d60bdb76
36+
# Install just* tooling
37+
- uses: linkerd/dev/actions/setup-tools@v39
38+
# Configure the default Rust toolchain
39+
- uses: linkerd/dev/actions/setup-rust@v39
5440
# Setup a cluster
5541
- run: curl --proto =https --tlsv1.3 -fLsSv "https://raw.githubusercontent.com/k3d-io/k3d/${K3D_VERSION}/install.sh" | bash
5642
- run: k3d --version
57-
- run: just-k3d K8S_VERSION=${{ matrix.k8s }} create
43+
- run: just-k3d create
5844
- run: kubectl version
5945
# Install CRDs
6046
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
lint:
2020
timeout-minutes: 5
2121
runs-on: ubuntu-latest
22-
container: docker://ghcr.io/linkerd/dev:v34-rust
22+
container: docker://ghcr.io/linkerd/dev:v39-rust
2323
steps:
2424
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
2525
- run: just fetch

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
test:
4242
timeout-minutes: 5
4343
runs-on: ubuntu-latest
44-
container: docker://ghcr.io/linkerd/dev:v34-rust
44+
container: docker://ghcr.io/linkerd/dev:v39-rust
4545
steps:
4646
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
4747
- run: just fetch
@@ -55,7 +55,7 @@ jobs:
5555
contents: write
5656
timeout-minutes: 5
5757
runs-on: ubuntu-latest
58-
container: docker://ghcr.io/linkerd/dev:v34-rust
58+
container: docker://ghcr.io/linkerd/dev:v39-rust
5959
steps:
6060
- if: needs.meta.outputs.publish
6161
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
@@ -80,7 +80,7 @@ jobs:
8080
needs: [meta, release]
8181
timeout-minutes: 10
8282
runs-on: ubuntu-latest
83-
container: docker://ghcr.io/linkerd/dev:v34-rust
83+
container: docker://ghcr.io/linkerd/dev:v39-rust
8484
steps:
8585
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
8686
- if: needs.meta.outputs.publish == ''

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ default = []
1616
experimental = []
1717

1818
[dependencies]
19-
kube = { version = "0.76", default-features = false, features = ["derive"] }
20-
k8s-openapi = { version = "0.16", features = ["schemars"] }
19+
kube = { version = "0.78", default-features = false, features = ["derive"] }
20+
k8s-openapi = { version = "0.17", features = ["schemars"] }
2121
schemars = { version = "0.8", features = ["derive"] }
2222
serde = { version = "1", features = ["derive"] }
2323
serde_json = "1"
2424

2525
[dev-dependencies.k8s-openapi]
26-
version = "0.16"
26+
version = "0.17"
2727
default-features = false
2828
features = ["v1_21"]
2929

integration/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ license = "Apache-2.0"
66
publish = false
77

88
[dev-dependencies]
9-
k8s-openapi = { version = "0.16", features = ["v1_21"] }
9+
k8s-openapi = { version = "0.17", features = ["v1_21"] }
1010
tokio = { version = "1", features = ["macros", "rt"] }
1111
tracing = "0.1"
1212
k8s-gateway-api = { path = ".." }
1313

1414
[dev-dependencies.kube]
15-
version = "0.76"
15+
version = "0.78"
1616
default-features = false
1717
features = ["client", "openssl-tls", "runtime", "ws"]

0 commit comments

Comments
 (0)