Skip to content
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
780 changes: 379 additions & 401 deletions Cargo.lock

Large diffs are not rendered by default.

1,986 changes: 986 additions & 1,000 deletions Cargo.nix

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2024"
repository = "https://github.com/stackabletech/opa-operator"

[workspace.dependencies]
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.121.0", features = ["webhook"] }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.122.0", features = ["webhook"] }
krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" }

anyhow = "1.0"
Expand All @@ -20,15 +20,15 @@ built = { version = "0.8", features = ["chrono", "git2"] }
byteorder = "1.5"
clap = "4.6"
const_format = "0.2"
flate2 = "1.0"
flate2 = "1.1"
fnv = "1.0"
futures = { version = "0.3" }
hyper = "1.11"
hyper = "1.12"
indoc = "2.0"
ldap3 = { version = "0.12", features = ["gssapi", "tls"] }
md5 = "0.8"
moka = { version = "0.12", default-features = false, features = ["future"] }
native-tls = "0.2.12"
native-tls = "0.2"
pin-project = "1.1"
# `default-features = false` drops reqwest 0.13's `default-tls = ["rustls"]`; we select
# `native-tls` (OpenSSL) to stay on the same TLS stack as ldap3 (see utils/tls.rs). The
Expand All @@ -37,7 +37,7 @@ pin-project = "1.1"
# charset/http2/system-proxy are reqwest 0.13 defaults re-added here.
# TODO(@maltesander): We should remove these and "native-tls" and add ca-certificates to the docker images?
reqwest = { version = "0.13", default-features = false, features = ["json", "form", "query", "native-tls", "charset", "http2", "system-proxy"] }
rstest = "0.26"
rstest = "0.28"
rustls = "0.23"
rustls-pki-types = "1.15"
semver = "1.0"
Expand All @@ -46,10 +46,10 @@ serde_json = "1.0"
snafu = "0.9"
strum = { version = "0.28", features = ["derive"] }
tar = "0.4"
tokio = { version = "1.53", features = ["full"] }
tokio = { version = "1.54", features = ["full"] }
tracing = "0.1"
url = "2.5"
uuid = "1.24"
uuid = "1.29"
wiremock = "0.6"
yaml_serde = "0.10"

Expand Down
18 changes: 9 additions & 9 deletions crate-hashes.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ allow = [
"Unicode-DFS-2016",
"Zlib",
"Unlicense",
"Apache-2.0 WITH LLVM-exception", # Needed for ar_archive_writer crate (transitive dependency)
]
private = { ignore = true }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ use stackable_operator::{
product_logging::framework::{
STACKABLE_LOG_DIR, ValidatedContainerLogConfigChoice, vector_container,
},
rbac::RbacResourceNames,
types::kubernetes::VolumeName,
},
};
Expand Down
4 changes: 2 additions & 2 deletions rust/operator-binary/src/crd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ pub mod versioned {
/// from an external directory service.
#[versioned(
changed(
since = "v1alpha2",
from_type = "Option<user_info_fetcher::v1alpha1::Config>"
in = "v1alpha2",
previous_type = "Option<user_info_fetcher::v1alpha1::Config>"
),
hint(option)
)]
Expand Down
2 changes: 1 addition & 1 deletion rust/operator-binary/src/crd/user_info_fetcher/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub mod versioned {
ActiveDirectory(ActiveDirectoryBackend),

/// Backend that fetches user information from Microsoft Entra
#[versioned(changed(since = "v1alpha2", from_name = "ExperimentalEntra"))]
#[versioned(changed(in = "v1alpha2", previous_name = "ExperimentalEntra"))]
Entra(EntraBackend),

/// Backend that fetches user information from OpenLDAP
Expand Down
Loading