Skip to content

Commit 62abf08

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/hadoop-3.5.0
2 parents 01e6d40 + 77cb342 commit 62abf08

22 files changed

Lines changed: 180 additions & 219 deletions

File tree

.scripts/upload_new_statsd_exporter_version.sh

Lines changed: 0 additions & 53 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ All notable changes to this project will be documented in this file.
1919

2020
### Changed
2121

22-
- airflow: Bump statsd_exporter to `0.29.0` ([#1522]).
22+
- airflow: Bump statsd_exporter to `0.30.0` ([#1524]).
2323
- ci: Bump `docker/login-action` from `v3.6.0` to `v4.1.0` and `stackabletech/actions` to `v0.14.3` to escape Node.js 20 deprecation ([#1507]).
2424
- hbase: Update `hbase-opa-authorizer` from `0.1.0` to `0.2.0` and then `0.3.0` ([#1446], [#1454]).
2525
- stackable-base: Bump `containerdebug` to `0.4.0` and `config-utils` to `0.4.0` ([#1521]).
26-
- statsd_exporter: Bump version from `0.28.0` to `0.29.0` ([#1522]).
27-
- superset: Bump statsd_exporter to `0.29.0` ([#1522]).
26+
- statsd_exporter: Bump version from `0.28.0` to `0.30.0` ([#1524]).
27+
This uses a git mirror and patchable instead of sourcing from Nexus.
28+
- superset: Bump statsd_exporter to `0.30.0` ([#1524]).
2829

2930
### Fixed
3031

@@ -39,6 +40,7 @@ All notable changes to this project will be documented in this file.
3940

4041
- nifi: Remove `1.28.1`, deprecate `2.7.2` ([#1520]).
4142
- opa: Remove `1.8.0` ([#1509]).
43+
- spark-k8s: Remove `3.5.7` and `4.0.1` ([#1525]).
4244

4345
[#1446]: https://github.com/stackabletech/docker-images/pull/1446
4446
[#1452]: https://github.com/stackabletech/docker-images/pull/1452
@@ -61,6 +63,8 @@ All notable changes to this project will be documented in this file.
6163
[#1518]: https://github.com/stackabletech/docker-images/pull/1518
6264
[#1520]: https://github.com/stackabletech/docker-images/pull/1520
6365
[#1521]: https://github.com/stackabletech/docker-images/pull/1521
66+
[#1525]: https://github.com/stackabletech/docker-images/pull/1525
67+
[#1524]: https://github.com/stackabletech/docker-images/pull/1524
6468

6569
## [26.3.0] - 2026-03-16
6670

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

airflow/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
2+
# check=error=true;skip=InvalidDefaultArgInFrom,SecretsUsedInArgOrEnv
23
# Disabled error checks:
34
# - SecretsUsedInArgOrEnv : OPA_AUTH_MANAGER is a false positive and breaks the build.
4-
# check=error=true;skip=InvalidDefaultArgInFrom,SecretsUsedInArgOrEnv
55

66
ARG GIT_SYNC_VERSION
77

airflow/boil-config.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# Deprecated since SDP 25.11
55
[versions."2.9.3".local-images]
6-
"shared/statsd-exporter" = "0.29.0"
6+
"shared/statsd-exporter" = "0.30.0"
77
vector = "0.55.0"
88
stackable-devel = "1.0.0"
99

@@ -20,7 +20,7 @@ nodejs-version = "20"
2020

2121
# LTS
2222
[versions."3.0.6".local-images]
23-
"shared/statsd-exporter" = "0.29.0"
23+
"shared/statsd-exporter" = "0.30.0"
2424
vector = "0.55.0"
2525
stackable-devel = "1.0.0"
2626

@@ -56,7 +56,7 @@ nodejs-version = "20"
5656

5757
# Supported
5858
[versions."3.1.6".local-images]
59-
"shared/statsd-exporter" = "0.29.0"
59+
"shared/statsd-exporter" = "0.30.0"
6060
vector = "0.55.0"
6161
stackable-devel = "1.0.0"
6262

deny.toml

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,57 @@ targets = [
1414

1515
[advisories]
1616
yanked = "deny"
17+
ignore = [
18+
# https://rustsec.org/advisories/RUSTSEC-2023-0071
19+
# "rsa" crate: Marvin Attack: potential key recovery through timing sidechannel
20+
#
21+
# No patch is yet available, however work is underway to migrate to a fully constant-time implementation.
22+
# So we need to accept this, as of SDP 26.3 we are "only" using the crate to create private +
23+
# public key pairs used by webhooks, such as conversion or mutating webhooks.
24+
#
25+
# https://github.com/RustCrypto/RSA/issues/19 is the tracking issue
26+
"RUSTSEC-2023-0071",
27+
28+
# https://rustsec.org/advisories/RUSTSEC-2024-0436
29+
# The "paste" crate is no longer maintained because the owner states that the implementation is
30+
# finished. There are at least two (forked) alternatives which state to be maintained. They'd
31+
# need to be vetted before a potential switch. Additionally, they'd need to be in a maintained
32+
# state for a couple of years to provide any benefit over using "paste".
33+
#
34+
# This crate is only used in a single place in the xtask package inside the declarative
35+
# "write_crd" macro. The impact of vulnerabilities, if any, should be fairly minimal.
36+
#
37+
# See thread: https://users.rust-lang.org/t/paste-alternatives/126787/4
38+
#
39+
# This can only be removed again if we decide to use a different crate.
40+
"RUSTSEC-2024-0436",
41+
42+
# https://rustsec.org/advisories/RUSTSEC-2026-0097
43+
# rand 0.8.5 is unsound when log+thread_rng features are enabled and a custom logger calls rand::rng().
44+
#
45+
# This version is pulled in transitively via num-bigint-dig -> rsa -> stackable-certs and cannot be
46+
# updated until the upstream rsa crate bumps its rand dependency.
47+
"RUSTSEC-2026-0097",
48+
49+
# https://rustsec.org/advisories/RUSTSEC-2026-0173
50+
# The author of `proc-macro-error2` has [confirmed](https://github.com/GnomedDev/proc-macro-error-2/issues/17#issuecomment-4643215473)
51+
# that the crate is no longer maintained and recommends that users migrate away from it.
52+
#
53+
# There currently is no way for us to negate this advisory, because that crate is not used
54+
# directly by us. We need to wait for new versions of oci-spec and getset. See the following
55+
# issue which tracks moving to a newer getset version: https://github.com/youki-dev/oci-spec-rs/issues/340
56+
#
57+
# proc-macro-error2 v2.0.1
58+
# └── getset v0.1.6
59+
# └── oci-spec v0.9.0
60+
# └── boil v0.2.1
61+
#
62+
# Alternate crates are:
63+
#
64+
# - https://crates.io/crates/manyhow
65+
# - https://github.com/SergioBenitez/proc-macro2-diagnostics
66+
"RUSTSEC-2026-0173",
67+
]
1768

1869
[bans]
1970
multiple-versions = "allow"
@@ -31,7 +82,7 @@ allow = [
3182
"LicenseRef-webpki",
3283
"MIT",
3384
"MPL-2.0",
34-
"OpenSSL", # Needed for the ring and/or aws-lc-sys crate. See https://github.com/stackabletech/operator-templating/pull/464 for details
85+
"OpenSSL", # Needed for the ring and/or aws-lc-sys crate. See https://github.com/stackabletech/operator-templating/pull/464 for details
3586
"Unicode-3.0",
3687
"Unicode-DFS-2016",
3788
"Zlib",
@@ -52,6 +103,7 @@ license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
52103
[sources]
53104
unknown-registry = "deny"
54105
unknown-git = "deny"
106+
allow-git = ["https://github.com/kube-rs/kube-rs"]
55107

56108
[sources.allow-org]
57109
github = ["stackabletech"]

opa/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
# syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
2+
# check=error=true;skip=InvalidDefaultArgInFrom
13

24
ARG GOLANG_VERSION
3-
45
FROM oci.stackable.tech/sdp/library/golang:${GOLANG_VERSION} AS golang-image
56

67
FROM local-image/stackable-devel AS multilog-builder

rust/boil/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44

55
All notable changes to this project will be documented in this file.
66

7+
## [0.2.2] - 2026-06-12
8+
9+
[See complete diff](https://github.com/stackabletech/docker-images/compare/boil-0.2.1..boil-0.2.2)
10+
11+
### Features
12+
13+
- Improve empty image version filter error ([#1527](https://github.com/stackabletech/docker-images/pull/1527)).
14+
- Add new image check command ([#1464](https://github.com/stackabletech/docker-images/pull/1464)).
15+
716
## [0.2.1] - 2026-04-17
817

918
[See complete diff](https://github.com/stackabletech/docker-images/compare/boil-0.2.0..boil-0.2.1)
@@ -12,6 +21,10 @@ All notable changes to this project will be documented in this file.
1221

1322
- Relax vendor version constraint ([#1469](https://github.com/stackabletech/docker-images/pull/1469)).
1423

24+
### Miscellaneous
25+
26+
- Vendor openssl for better portability ([#1459](https://github.com/stackabletech/docker-images/pull/1459)).
27+
1528
## [0.2.0] - 2026-04-14
1629

1730
[See complete diff](https://github.com/stackabletech/docker-images/compare/boil-0.1.7..boil-0.2.0)

rust/boil/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "boil"
3-
version = "0.2.1" # Managed by .scripts/release_boil.sh
3+
version = "0.2.2" # Managed by .scripts/release_boil.sh
44
edition = "2024"
55
authors.workspace = true
66
license.workspace = true

rust/boil/src/core/bakefile.rs

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,17 @@ pub enum Error {
7070

7171
#[derive(Debug, Snafu)]
7272
pub enum TargetsError {
73-
#[snafu(display("encountered invalid image version"))]
74-
InvalidImageVersion { source: ImageConfigError },
75-
7673
#[snafu(display("failed to read image config"))]
7774
ReadImageConfig { source: ImageConfigError },
7875

7976
#[snafu(display("failed to resolve parent directory of image config at {path}", path = path.display()))]
8077
ResolveParentDirectory { path: PathBuf },
78+
79+
#[snafu(display("provided filter version(s) ({image_name}={versions}) yielded empty list", versions = versions.join(", ")))]
80+
EmptyFilter {
81+
versions: Vec<String>,
82+
image_name: String,
83+
},
8184
}
8285

8386
#[derive(Debug, Default)]
@@ -187,9 +190,15 @@ impl Targets {
187190
ImageConfig::from_file(image_config_path).context(ReadImageConfigSnafu)?;
188191

189192
// Create a list of image versions we need to generate targets for in the bakefile.
190-
image_config
191-
.filter_by_version(&image.versions)
192-
.context(InvalidImageVersionSnafu)?;
193+
image_config.filter_by_version(&image.versions);
194+
195+
ensure!(
196+
!image_config.versions.is_empty(),
197+
EmptyFilterSnafu {
198+
versions: image.versions.clone(),
199+
image_name: image.name.clone(),
200+
}
201+
);
193202

194203
targets.insert_targets(image.name.clone(), image_config, &options, true)?;
195204
}
@@ -222,9 +231,15 @@ impl Targets {
222231
let mut image_config =
223232
ImageConfig::from_file(image_config_path).context(ReadImageConfigSnafu)?;
224233

225-
image_config
226-
.filter_by_version(&[image_version])
227-
.context(InvalidImageVersionSnafu)?;
234+
image_config.filter_by_version(&[image_version]);
235+
236+
ensure!(
237+
!image_config.versions.is_empty(),
238+
EmptyFilterSnafu {
239+
versions: vec![image_version.clone()],
240+
image_name: image_name.clone(),
241+
}
242+
);
228243

229244
// Wowzers, recursion!
230245
self.insert_targets(image_name.clone(), image_config, options, false)?;

0 commit comments

Comments
 (0)