Skip to content

Commit 36c63b3

Browse files
committed
Remove commons mod. Add time feature
1 parent ab74e87 commit 36c63b3

File tree

9 files changed

+14
-11
lines changed

9 files changed

+14
-11
lines changed

Cargo.lock

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

crates/stackable-certs/src/ca/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use const_oid::db::rfc5280::{ID_KP_CLIENT_AUTH, ID_KP_SERVER_AUTH};
66
use k8s_openapi::api::core::v1::Secret;
77
use kube::{Api, Client, runtime::reflector::ObjectRef};
88
use snafu::{OptionExt, ResultExt, Snafu};
9-
use stackable_shared::{commons::secret::SecretReference, time::Duration};
9+
use stackable_shared::{secret::SecretReference, time::Duration};
1010
use tracing::{debug, instrument};
1111
use x509_cert::{
1212
Certificate,

crates/stackable-operator/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ All notable changes to this project will be documented in this file.
2121
- BREAKING: Some modules have been moved into the `stackable-shared` crate, so that they can also be
2222
used in `stackable-certs` and `stackable-webhook` ([#1074]):
2323
- The module `stackable_operator::time` has moved to `stackable_operator::shared::time`
24-
- The module `stackable_operator::commons::secret` has moved to `stackable_operator::shared::commons::secret`
24+
- The module `stackable_operator::commons::secret` has moved to `stackable_operator::shared::secret`
2525

2626
### Fixed
2727

crates/stackable-operator/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ edition.workspace = true
88
repository.workspace = true
99

1010
[features]
11-
full = ["certs", "telemetry", "time", "versioned", "webhook"]
12-
default = ["telemetry", "time", "versioned"]
11+
full = ["certs", "telemetry", "versioned", "webhook"]
12+
default = ["telemetry", "versioned"]
1313

1414
certs = ["dep:stackable-certs"]
1515
telemetry = ["dep:stackable-telemetry"]
16-
time = ["dep:time"]
1716
versioned = ["dep:stackable-versioned"]
1817
webhook = ["dep:stackable-webhook"]
1918

@@ -47,7 +46,6 @@ serde_yaml.workspace = true
4746
serde.workspace = true
4847
snafu.workspace = true
4948
strum.workspace = true
50-
time = { workspace = true, optional = true }
5149
tokio.workspace = true
5250
tracing.workspace = true
5351
tracing-appender.workspace = true

crates/stackable-shared/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ license.workspace = true
66
edition.workspace = true
77
repository.workspace = true
88

9+
[features]
10+
full = ["time"]
11+
default = ["time"]
12+
13+
time = ["dep:time"]
14+
915
[dependencies]
1016
k8s-openapi.workspace = true
1117
kube.workspace = true
@@ -15,7 +21,7 @@ serde.workspace = true
1521
serde_yaml.workspace = true
1622
snafu.workspace = true
1723
strum.workspace = true
18-
time.workspace = true
24+
time = { workspace = true, optional = true }
1925

2026
[dev-dependencies]
2127
k8s-openapi.workspace = true

crates/stackable-shared/src/commons/mod.rs

Lines changed: 0 additions & 1 deletion
This file was deleted.

crates/stackable-shared/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//! This crate contains various shared helpers and utilities used across other crates in this
22
//! workspace.
33
4-
pub mod commons;
54
pub mod crd;
5+
pub mod secret;
6+
#[cfg(feature = "time")]
67
pub mod time;
78
pub mod yaml;

crates/xtask/src/crd/dummy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub mod versioned {
4444
pdb_config: stackable_operator::commons::pdb::PdbConfig,
4545
product_image: stackable_operator::commons::product_image_selection::ProductImage,
4646
secret_class_volume: stackable_operator::commons::secret_class::SecretClassVolume,
47-
secret_reference: stackable_operator::shared::commons::secret::SecretReference,
47+
secret_reference: stackable_operator::shared::secret::SecretReference,
4848
tls_client_details: stackable_operator::commons::tls_verification::TlsClientDetails,
4949

5050
// Already versioned

0 commit comments

Comments
 (0)