Skip to content

Commit 2a5f0e7

Browse files
committed
chore: Bump stackable-operator and use re-exports
1 parent 95a4189 commit 2a5f0e7

File tree

7 files changed

+78
-57
lines changed

7 files changed

+78
-57
lines changed

Cargo.lock

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

Cargo.nix

Lines changed: 48 additions & 29 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,9 +11,7 @@ repository = "https://github.com/stackabletech/hbase-operator"
1111

1212
[workspace.dependencies]
1313
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
14-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.90.0" }
15-
stackable-telemetry = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-telemetry-0.4.0" }
16-
stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.7.1" }
14+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.91.1" }
1715

1816
anyhow = "1.0"
1917
built = { version = "0.7", features = ["chrono", "git2"] }

crate-hashes.json

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

rust/operator-binary/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ publish = false
1111
[dependencies]
1212
product-config.workspace = true
1313
stackable-operator.workspace = true
14-
stackable-telemetry.workspace = true
15-
stackable-versioned.workspace = true
1614

1715
anyhow.workspace = true
1816
clap.workspace = true

rust/operator-binary/src/crd/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ use stackable_operator::{
3131
schemars::{self, JsonSchema},
3232
status::condition::{ClusterCondition, HasStatusCondition},
3333
time::Duration,
34+
versioned::versioned,
3435
};
35-
use stackable_versioned::versioned;
3636
use strum::{Display, EnumIter, EnumString};
3737

3838
use crate::crd::{affinity::get_affinity, security::AuthorizationConfig};
@@ -110,6 +110,8 @@ pub enum Error {
110110

111111
#[versioned(version(name = "v1alpha1"))]
112112
pub mod versioned {
113+
use stackable_operator::versioned::versioned;
114+
113115
/// An HBase cluster stacklet. This resource is managed by the Stackable operator for Apache HBase.
114116
/// Find more information on how to use it and the resources that the operator generates in the
115117
/// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/hbase/).

rust/operator-binary/src/main.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
use std::{ops::Deref as _, sync::Arc};
1+
use std::sync::Arc;
22

33
use clap::Parser;
44
use futures::StreamExt;
55
use hbase_controller::FULL_HBASE_CONTROLLER_NAME;
66
use stackable_operator::{
77
YamlSchema,
8-
cli::{Command, ProductOperatorRun, RollingPeriod},
8+
cli::{Command, ProductOperatorRun},
99
k8s_openapi::api::{
1010
apps::v1::StatefulSet,
1111
core::v1::{ConfigMap, Service},
@@ -22,8 +22,11 @@ use stackable_operator::{
2222
},
2323
logging::controller::report_controller_reconciled,
2424
shared::yaml::SerializeOptions,
25+
telemetry::{
26+
Tracing,
27+
tracing::{RollingPeriod, settings::Settings},
28+
},
2529
};
26-
use stackable_telemetry::{Tracing, tracing::settings::Settings};
2730
use tracing::level_filters::LevelFilter;
2831

2932
use crate::crd::{HbaseCluster, v1alpha1};
@@ -84,7 +87,6 @@ async fn main() -> anyhow::Result<()> {
8487
let rotation_period = telemetry_arguments
8588
.rolling_logs_period
8689
.unwrap_or(RollingPeriod::Hourly)
87-
.deref()
8890
.clone();
8991

9092
Settings::builder()

0 commit comments

Comments
 (0)