Skip to content

Commit 3a43ee6

Browse files
committed
chore: Remove separate CRD crate
1 parent 0191244 commit 3a43ee6

20 files changed

+67
-94
lines changed

Cargo.lock

Lines changed: 6 additions & 21 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = ["rust/crd", "rust/operator-binary"]
2+
members = ["rust/operator-binary"]
33
resolver = "2"
44

55
[workspace.package]

rust/crd/Cargo.toml

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

rust/operator-binary/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repository.workspace = true
99
publish = false
1010

1111
[dependencies]
12-
stackable-kafka-crd = { path = "../crd" }
12+
indoc.workspace = true
1313
anyhow.workspace = true
1414
clap.workspace = true
1515
const_format.workspace = true
@@ -25,6 +25,7 @@ tracing.workspace = true
2525

2626
[dev-dependencies]
2727
serde_yaml.workspace = true
28+
rstest.workspace = true
2829

2930
[build-dependencies]
3031
built.workspace = true

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
use snafu::{OptionExt, ResultExt, Snafu};
2-
use stackable_kafka_crd::{
3-
KafkaConfig, KafkaConfigFragment, JVM_SECURITY_PROPERTIES_FILE, METRICS_PORT,
4-
STACKABLE_CONFIG_DIR,
5-
};
62
use stackable_operator::{
73
memory::{BinaryMultiple, MemoryQuantity},
84
role_utils::{self, GenericRoleConfig, JavaCommonConfig, JvmArgumentOverrides, Role},
95
};
106

7+
use crate::crd::{
8+
KafkaConfig, KafkaConfigFragment, JVM_SECURITY_PROPERTIES_FILE, METRICS_PORT,
9+
STACKABLE_CONFIG_DIR,
10+
};
11+
1112
const JAVA_HEAP_FACTOR: f32 = 0.8;
1213

1314
#[derive(Snafu, Debug)]
@@ -97,9 +98,8 @@ fn is_heap_jvm_argument(jvm_argument: &str) -> bool {
9798

9899
#[cfg(test)]
99100
mod tests {
100-
use stackable_kafka_crd::{KafkaCluster, KafkaRole};
101-
102101
use super::*;
102+
use crate::crd::{KafkaCluster, KafkaRole};
103103

104104
#[test]
105105
fn test_construct_jvm_arguments_defaults() {

rust/crd/src/affinity.rs renamed to rust/operator-binary/src/crd/affinity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use stackable_operator::{
33
k8s_openapi::api::core::v1::PodAntiAffinity,
44
};
55

6-
use crate::{KafkaRole, APP_NAME};
6+
use crate::crd::{KafkaRole, APP_NAME};
77

88
pub fn get_affinity(cluster_name: &str, role: &KafkaRole) -> StackableAffinityFragment {
99
StackableAffinityFragment {

rust/crd/src/authentication.rs renamed to rust/operator-binary/src/crd/authentication.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use stackable_operator::{
66
schemars::{self, JsonSchema},
77
};
88

9-
use crate::ObjectRef;
9+
use crate::crd::ObjectRef;
1010

1111
pub const SUPPORTED_AUTHENTICATION_CLASS_PROVIDERS: [&str; 2] = ["TLS", "Kerberos"];
1212

rust/crd/src/listener.rs renamed to rust/operator-binary/src/crd/listener.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use snafu::{OptionExt, Snafu};
77
use stackable_operator::{kube::ResourceExt, utils::cluster_info::KubernetesClusterInfo};
88
use strum::{EnumDiscriminants, EnumString};
99

10-
use crate::{security::KafkaTlsSecurity, KafkaCluster, STACKABLE_LISTENER_BROKER_DIR};
10+
use crate::crd::{security::KafkaTlsSecurity, KafkaCluster, STACKABLE_LISTENER_BROKER_DIR};
1111

1212
const LISTENER_LOCAL_ADDRESS: &str = "0.0.0.0";
1313

@@ -273,7 +273,7 @@ mod tests {
273273
};
274274

275275
use super::*;
276-
use crate::authentication::ResolvedAuthenticationClasses;
276+
use crate::crd::authentication::ResolvedAuthenticationClasses;
277277

278278
fn default_cluster_info() -> KubernetesClusterInfo {
279279
KubernetesClusterInfo {

rust/crd/src/lib.rs renamed to rust/operator-binary/src/crd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use stackable_operator::{
3939
};
4040
use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
4141

42-
use crate::{authorization::KafkaAuthorization, tls::KafkaTls};
42+
use crate::crd::{authorization::KafkaAuthorization, tls::KafkaTls};
4343

4444
pub const DOCKER_IMAGE_BASE_NAME: &str = "kafka";
4545
pub const APP_NAME: &str = "kafka";

rust/crd/src/security.rs renamed to rust/operator-binary/src/crd/security.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use stackable_operator::{
2727
utils::COMMON_BASH_TRAP_FUNCTIONS,
2828
};
2929

30-
use crate::{
30+
use crate::crd::{
3131
authentication::{self, ResolvedAuthenticationClasses},
3232
listener::{self, node_address_cmd, KafkaListenerConfig},
3333
tls, KafkaCluster, KafkaRole, LISTENER_BOOTSTRAP_VOLUME_NAME, LISTENER_BROKER_VOLUME_NAME,
File renamed without changes.

rust/operator-binary/src/discovery.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
use std::num::TryFromIntError;
22

33
use snafu::{OptionExt, ResultExt, Snafu};
4-
use stackable_kafka_crd::{security::KafkaTlsSecurity, KafkaCluster, KafkaRole};
54
use stackable_operator::{
65
builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
76
commons::{listener::Listener, product_image_selection::ResolvedProductImage},
87
k8s_openapi::api::core::v1::{ConfigMap, Service},
98
kube::{runtime::reflector::ObjectRef, Resource, ResourceExt},
109
};
1110

12-
use crate::{kafka_controller::KAFKA_CONTROLLER_NAME, utils::build_recommended_labels};
11+
use crate::{
12+
crd::{security::KafkaTlsSecurity, KafkaCluster, KafkaRole},
13+
kafka_controller::KAFKA_CONTROLLER_NAME,
14+
utils::build_recommended_labels,
15+
};
1316

1417
#[derive(Snafu, Debug)]
1518
pub enum Error {

rust/operator-binary/src/kafka_controller.rs

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@ use product_config::{
1212
ProductConfigManager,
1313
};
1414
use snafu::{OptionExt, ResultExt, Snafu};
15-
use stackable_kafka_crd::{
16-
listener::{get_kafka_listener_config, pod_fqdn, KafkaListenerError},
17-
security::KafkaTlsSecurity,
18-
Container, KafkaCluster, KafkaClusterStatus, KafkaConfig, KafkaRole, APP_NAME,
19-
DOCKER_IMAGE_BASE_NAME, JVM_SECURITY_PROPERTIES_FILE, KAFKA_HEAP_OPTS,
20-
LISTENER_BOOTSTRAP_VOLUME_NAME, LISTENER_BROKER_VOLUME_NAME, LOG_DIRS_VOLUME_NAME,
21-
METRICS_PORT, METRICS_PORT_NAME, OPERATOR_NAME, SERVER_PROPERTIES_FILE, STACKABLE_CONFIG_DIR,
22-
STACKABLE_DATA_DIR, STACKABLE_LISTENER_BOOTSTRAP_DIR, STACKABLE_LISTENER_BROKER_DIR,
23-
STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR,
24-
};
2515
use stackable_operator::{
2616
builder::{
2717
self,
@@ -84,6 +74,16 @@ use strum::{EnumDiscriminants, IntoStaticStr};
8474

8575
use crate::{
8676
config::jvm::{construct_heap_jvm_args, construct_non_heap_jvm_args},
77+
crd::{
78+
listener::{get_kafka_listener_config, pod_fqdn, KafkaListenerError},
79+
security::KafkaTlsSecurity,
80+
Container, KafkaCluster, KafkaClusterStatus, KafkaConfig, KafkaRole, APP_NAME,
81+
DOCKER_IMAGE_BASE_NAME, JVM_SECURITY_PROPERTIES_FILE, KAFKA_HEAP_OPTS,
82+
LISTENER_BOOTSTRAP_VOLUME_NAME, LISTENER_BROKER_VOLUME_NAME, LOG_DIRS_VOLUME_NAME,
83+
METRICS_PORT, METRICS_PORT_NAME, OPERATOR_NAME, SERVER_PROPERTIES_FILE,
84+
STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR, STACKABLE_LISTENER_BOOTSTRAP_DIR,
85+
STACKABLE_LISTENER_BROKER_DIR, STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR,
86+
},
8787
discovery::{self, build_discovery_configmaps},
8888
kerberos::{self, add_kerberos_pod_config},
8989
operations::{
@@ -221,7 +221,7 @@ pub enum Error {
221221

222222
#[snafu(display("invalid kafka listeners"))]
223223
InvalidKafkaListeners {
224-
source: stackable_kafka_crd::listener::KafkaListenerError,
224+
source: crate::crd::listener::KafkaListenerError,
225225
},
226226

227227
#[snafu(display("failed to add listener volume"))]
@@ -241,17 +241,15 @@ pub enum Error {
241241
},
242242

243243
#[snafu(display("failed to initialize security context"))]
244-
FailedToInitializeSecurityContext {
245-
source: stackable_kafka_crd::security::Error,
246-
},
244+
FailedToInitializeSecurityContext { source: crate::crd::security::Error },
247245

248246
#[snafu(display("failed to create cluster resources"))]
249247
CreateClusterResources {
250248
source: stackable_operator::cluster_resources::Error,
251249
},
252250

253251
#[snafu(display("failed to resolve and merge config for role and role group"))]
254-
FailedToResolveConfig { source: stackable_kafka_crd::Error },
252+
FailedToResolveConfig { source: crate::crd::Error },
255253

256254
#[snafu(display("failed to resolve the Vector aggregator address"))]
257255
ResolveVectorAggregatorAddress {
@@ -285,7 +283,7 @@ pub enum Error {
285283
},
286284

287285
#[snafu(display("internal operator failure"))]
288-
InternalOperatorError { source: stackable_kafka_crd::Error },
286+
InternalOperatorError { source: crate::crd::Error },
289287

290288
#[snafu(display(
291289
"failed to serialize [{JVM_SECURITY_PROPERTIES_FILE}] for {}",
@@ -323,9 +321,7 @@ pub enum Error {
323321
},
324322

325323
#[snafu(display("failed to add Secret Volumes and VolumeMounts"))]
326-
AddVolumesAndVolumeMounts {
327-
source: stackable_kafka_crd::security::Error,
328-
},
324+
AddVolumesAndVolumeMounts { source: crate::crd::security::Error },
329325

330326
#[snafu(display("failed to resolve the fully-qualified pod name"))]
331327
ResolveNamespace { source: KafkaListenerError },
@@ -334,9 +330,7 @@ pub enum Error {
334330
AddKerberosConfig { source: kerberos::Error },
335331

336332
#[snafu(display("failed to validate authentication method"))]
337-
FailedToValidateAuthenticationMethod {
338-
source: stackable_kafka_crd::security::Error,
339-
},
333+
FailedToValidateAuthenticationMethod { source: crate::crd::security::Error },
340334

341335
#[snafu(display("failed to add needed volume"))]
342336
AddVolume { source: builder::pod::Error },

rust/operator-binary/src/kerberos.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
use snafu::{ResultExt, Snafu};
2-
use stackable_kafka_crd::{
3-
security::KafkaTlsSecurity, KafkaRole, LISTENER_BOOTSTRAP_VOLUME_NAME,
4-
LISTENER_BROKER_VOLUME_NAME, STACKABLE_KERBEROS_DIR, STACKABLE_KERBEROS_KRB5_PATH,
5-
};
62
use stackable_operator::builder::{
73
self,
84
pod::{
@@ -15,6 +11,11 @@ use stackable_operator::builder::{
1511
},
1612
};
1713

14+
use crate::crd::{
15+
security::KafkaTlsSecurity, KafkaRole, LISTENER_BOOTSTRAP_VOLUME_NAME,
16+
LISTENER_BROKER_VOLUME_NAME, STACKABLE_KERBEROS_DIR, STACKABLE_KERBEROS_KRB5_PATH,
17+
};
18+
1819
#[derive(Snafu, Debug)]
1920
pub enum Error {
2021
#[snafu(display("failed to add Kerberos secret volume"))]

rust/operator-binary/src/main.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use std::sync::Arc;
33
use clap::{crate_description, crate_version, Parser};
44
use futures::StreamExt;
55
use product_config::ProductConfigManager;
6-
use stackable_kafka_crd::{KafkaCluster, APP_NAME, OPERATOR_NAME};
76
use stackable_operator::{
87
cli::{Command, ProductOperatorRun},
98
client::{self, Client},
@@ -25,9 +24,13 @@ use stackable_operator::{
2524
CustomResourceExt,
2625
};
2726

28-
use crate::kafka_controller::KAFKA_FULL_CONTROLLER_NAME;
27+
use crate::{
28+
crd::{KafkaCluster, APP_NAME, OPERATOR_NAME},
29+
kafka_controller::KAFKA_FULL_CONTROLLER_NAME,
30+
};
2931

3032
mod config;
33+
mod crd;
3134
mod discovery;
3235
mod kafka_controller;
3336
mod kerberos;

rust/operator-binary/src/operations/graceful_shutdown.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use std::collections::BTreeMap;
22

33
use snafu::{ResultExt, Snafu};
4-
use stackable_kafka_crd::KafkaConfig;
54
use stackable_operator::builder::pod::PodBuilder;
65

6+
use crate::crd::KafkaConfig;
7+
78
#[derive(Debug, Snafu)]
89
pub enum Error {
910
#[snafu(display("Failed to set terminationGracePeriod"))]

rust/operator-binary/src/operations/pdb.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
use snafu::{ResultExt, Snafu};
2-
use stackable_kafka_crd::{KafkaCluster, KafkaRole, APP_NAME, OPERATOR_NAME};
32
use stackable_operator::{
43
builder::pdb::PodDisruptionBudgetBuilder, client::Client, cluster_resources::ClusterResources,
54
commons::pdb::PdbConfig, kube::ResourceExt,
65
};
76

8-
use crate::kafka_controller::KAFKA_CONTROLLER_NAME;
7+
use crate::{
8+
crd::{KafkaCluster, KafkaRole, APP_NAME, OPERATOR_NAME},
9+
kafka_controller::KAFKA_CONTROLLER_NAME,
10+
};
911

1012
#[derive(Snafu, Debug)]
1113
pub enum Error {

0 commit comments

Comments
 (0)