Skip to content

Commit da02205

Browse files
committed
chore: Upgrade stackable-operator to 0.110.0
1 parent c224460 commit da02205

11 files changed

Lines changed: 148 additions & 65 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/hive-operator"
1111

1212
[workspace.dependencies]
1313
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.8.0" }
14-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.108.0", features = ["crds", "webhook"] }
14+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.110.0", features = ["crds", "webhook"] }
1515

1616
anyhow = "1.0"
1717
built = { version = "0.8", features = ["chrono", "git2"] }
@@ -20,8 +20,6 @@ const_format = "0.2"
2020
fnv = "1.0"
2121
futures = { version = "0.3", features = ["compat"] }
2222
indoc = "2.0"
23-
# We pin the kube version, as we use a patch for 2.0.1 below
24-
kube = "=2.0.1"
2523
pin-project = "1.1"
2624
rstest = "0.26"
2725
semver = "1.0"

rust/operator-binary/src/config/jvm.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use snafu::{OptionExt, ResultExt, Snafu};
22
use stackable_operator::{
33
memory::{BinaryMultiple, MemoryQuantity},
4-
role_utils::{self, JavaCommonConfig, JvmArgumentOverrides, Role},
4+
role_utils::{self, JvmArgumentOverrides},
55
};
66

77
use crate::crd::{
8-
JVM_SECURITY_PROPERTIES_FILE, METRICS_PORT, MetaStoreConfig, MetaStoreConfigFragment,
8+
HiveRoleType, JVM_SECURITY_PROPERTIES_FILE, METRICS_PORT, MetaStoreConfig,
99
STACKABLE_CONFIG_DIR, STACKABLE_TRUST_STORE, STACKABLE_TRUST_STORE_PASSWORD,
10-
v1alpha1::{HiveCluster, HiveMetastoreRoleConfig},
10+
v1alpha1::HiveCluster,
1111
};
1212

1313
const JAVA_HEAP_FACTOR: f32 = 0.8;
@@ -29,7 +29,7 @@ pub enum Error {
2929
/// All JVM arguments.
3030
fn construct_jvm_args(
3131
hive: &HiveCluster,
32-
role: &Role<MetaStoreConfigFragment, HiveMetastoreRoleConfig, JavaCommonConfig>,
32+
role: &HiveRoleType,
3333
role_group: &str,
3434
) -> Result<Vec<String>, Error> {
3535
let mut jvm_args = vec![
@@ -60,7 +60,7 @@ fn construct_jvm_args(
6060
/// [`construct_hadoop_heapsize_env`]).
6161
pub fn construct_non_heap_jvm_args(
6262
hive: &HiveCluster,
63-
role: &Role<MetaStoreConfigFragment, HiveMetastoreRoleConfig, JavaCommonConfig>,
63+
role: &HiveRoleType,
6464
role_group: &str,
6565
) -> Result<String, Error> {
6666
let mut jvm_args = construct_jvm_args(hive, role, role_group)?;
@@ -190,12 +190,7 @@ mod tests {
190190

191191
fn construct_boilerplate(
192192
hive_cluster: &str,
193-
) -> (
194-
HiveCluster,
195-
MetaStoreConfig,
196-
Role<MetaStoreConfigFragment, HiveMetastoreRoleConfig, JavaCommonConfig>,
197-
String,
198-
) {
193+
) -> (HiveCluster, MetaStoreConfig, HiveRoleType, String) {
199194
let hive: HiveCluster = serde_yaml::from_str(hive_cluster).expect("illegal test input");
200195

201196
let hive_role = HiveRole::MetaStore;

rust/operator-binary/src/config/opa.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl HiveOpaConfig {
5353
) -> Result<Self, stackable_operator::commons::opa::Error> {
5454
// See: https://github.com/boschglobal/hive-metastore-opa-authorizer?tab=readme-ov-file#configuration
5555
let base_endpoint = opa_config
56-
.full_document_url_from_config_map(client, hive, None, OpaApiVersion::V1)
56+
.full_document_url_from_config_map(client, hive, None, &OpaApiVersion::V1)
5757
.await?;
5858

5959
let tls_secret_class = client

0 commit comments

Comments
 (0)