Skip to content

Commit 4f6d38a

Browse files
authored
Merge branch 'main' into docs/update-stackable-overview
2 parents 031e239 + a9e3439 commit 4f6d38a

File tree

3 files changed

+33
-6
lines changed

3 files changed

+33
-6
lines changed

config/versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# IMPORTANT
33
# If you change the Rust toolchain version here, make sure to also change
44
# docker-images/ubi8-rust-builder/Dockerfile & docker-images/ubi9-rust-builder/Dockerfile
5-
rust_version: 1.81.0
5+
rust_version: 1.82.0
66

77
# IMPORTANT
88
# If you change the Hadolint version here, make sure to also change the hook

template/.github/workflows/integration-test.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@ on:
2121
inputs:
2222
test-platform:
2323
description: |
24-
The test platform to run on (kind doesn't support `arm64`)
24+
The test platform to run on
2525
required: true
2626
type: choice
2727
options:
28-
- kind-1.31.0
29-
- kind-1.30.3
28+
- kind-1.31.2
29+
- kind-1.30.6
30+
- rke2-1.31.2
31+
- rke2-1.30.6
32+
- k3s-1.31.2
33+
- k3s-1.30.6
3034
- aks-1.29
3135
- aks-1.28
3236
- aks-1.27
@@ -41,7 +45,8 @@ on:
4145
- okd-4.13
4246
test-architecture:
4347
description: |
44-
The architecture the tests will run on
48+
The architecture the tests will run on. Consult the run-integration-test action README for
49+
more details on supported architectures for each distribution
4550
required: true
4651
type: choice
4752
options:
@@ -81,7 +86,7 @@ jobs:
8186

8287
- name: Run Integration Test
8388
id: test
84-
uses: stackabletech/actions/run-integration-test@5b66858af3597c4ea34f9b33664b8034a1d28427 # v0.3.0
89+
uses: stackabletech/actions/run-integration-test@5901c3b1455488820c4be367531e07c3c3e82538 # v0.4.0
8590
with:
8691
test-platform: ${{ env.TEST_PLATFORM }}-${{ env.TEST_ARCHITECTURE }}
8792
test-run: ${{ env.TEST_RUN }}

template/deny.toml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,27 @@ targets = [
99

1010
[advisories]
1111
yanked = "deny"
12+
ignore = [
13+
# https://rustsec.org/advisories/RUSTSEC-2023-0071
14+
# "rsa" crate: Marvin Attack: potential key recovery through timing sidechannel
15+
#
16+
# No patch is yet available, however work is underway to migrate to a fully constant-time implementation
17+
# So we need to accept this, as of SDP 24.11 we are not using the rsa crate to create certificates used in production
18+
# setups.
19+
#
20+
# TODO: Remove after https://github.com/RustCrypto/RSA/pull/394 is merged
21+
"RUSTSEC-2023-0071",
22+
23+
# https://rustsec.org/advisories/RUSTSEC-2024-0384
24+
# "instant" is unmaintained
25+
#
26+
# The upstream "kube" crate also silenced this in https://github.com/kube-rs/kube/commit/4f1e889f265da8f19f03f60683569cae1a154fda
27+
# They/we are actively working on migrating kube from backoff to backon, which removes the transitive dependency on
28+
# instant, in https://github.com/kube-rs/kube/pull/1652.
29+
#
30+
# TODO: Remove after https://github.com/kube-rs/kube/pull/1652 is merged
31+
"RUSTSEC-2024-0384",
32+
]
1233

1334
[bans]
1435
multiple-versions = "allow"
@@ -26,6 +47,7 @@ allow = [
2647
"LicenseRef-webpki",
2748
"MIT",
2849
"MPL-2.0",
50+
"OpenSSL", # Needed for the ring and/or aws-lc-sys crate. See https://github.com/stackabletech/operator-templating/pull/464 for details
2951
"Unicode-3.0",
3052
"Unicode-DFS-2016",
3153
"Zlib",

0 commit comments

Comments
 (0)