Skip to content

Commit 40c8e75

Browse files
chore: Remove product config
1 parent 300422c commit 40c8e75

12 files changed

Lines changed: 305 additions & 2125 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ edition = "2024"
99
repository = "https://github.com/stackabletech/operator-rs"
1010

1111
[workspace.dependencies]
12-
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.8.0" }
13-
1412
arc-swap = "1.7.0"
1513
async-trait = "0.1.89"
1614
axum = { version = "0.8.1", features = ["http2"] }

crates/stackable-operator/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jiff.workspace = true
4242
json-patch = { workspace = true, features = ["schemars"] }
4343
k8s-openapi.workspace = true
4444
kube.workspace = true
45-
product-config.workspace = true
4645
rand.workspace = true
4746
regex.workspace = true
4847
schemars.workspace = true

crates/stackable-operator/src/cli/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ use crate::{namespace::WatchNamespace, utils::cluster_info::KubernetesClusterInf
88

99
mod environment;
1010
mod maintenance;
11-
mod product_config;
1211

1312
pub use environment::*;
1413
pub use maintenance::*;
15-
pub use product_config::*;
1614

1715
// NOTE (@Techassi): Why the hell is this here? Let's get rid of it.
1816
pub const AUTHOR: &str = "Stackable GmbH - info@stackable.tech";
@@ -80,10 +78,6 @@ pub enum Command<Run: Args = RunArguments> {
8078
#[derive(Debug, PartialEq, Eq, Parser)]
8179
#[command(long_about = "")]
8280
pub struct RunArguments {
83-
/// Provides the path to a product-config file
84-
#[arg(long, short = 'p', value_name = "FILE", default_value = "", env)]
85-
pub product_config: ProductConfigPath,
86-
8781
// TODO (@Techassi): This should be moved into the environment options
8882
/// Provides a specific namespace to watch (instead of watching all namespaces)
8983
#[arg(long, env, default_value = "")]

crates/stackable-operator/src/cli/product_config.rs

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

crates/stackable-operator/src/cluster_resources.rs

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ impl ClusterResource for Deployment {
338338
/// client::Client,
339339
/// cluster_resources::{self, ClusterResourceApplyStrategy, ClusterResources},
340340
/// deep_merger::ObjectOverrides,
341-
/// product_config_utils::ValidatedRoleConfigByPropertyKind,
342341
/// role_utils::Role,
343342
/// };
344343
///
@@ -366,8 +365,6 @@ impl ClusterResource for Deployment {
366365
/// };
367366
///
368367
/// async fn reconcile(app: Arc<AppCluster>, client: Arc<Client>) -> Result<Action, Error> {
369-
/// let validated_config = ValidatedRoleConfigByPropertyKind::default();
370-
///
371368
/// let mut cluster_resources = ClusterResources::new(
372369
/// APP_NAME,
373370
/// OPERATOR_NAME,
@@ -384,27 +381,23 @@ impl ClusterResource for Deployment {
384381
/// .await
385382
/// .map_err(|source| Error::AddClusterResource { source })?;
386383
///
387-
/// for (role_name, group_config) in validated_config.iter() {
388-
/// for (rolegroup_name, rolegroup_config) in group_config.iter() {
389-
/// let rolegroup_service = Service::default();
390-
/// cluster_resources
391-
/// .add(&client, rolegroup_service)
392-
/// .await
393-
/// .map_err(|source| Error::AddClusterResource { source })?;
384+
/// let rolegroup_service = Service::default();
385+
/// cluster_resources
386+
/// .add(&client, rolegroup_service)
387+
/// .await
388+
/// .map_err(|source| Error::AddClusterResource { source })?;
394389
///
395-
/// let rolegroup_configmap = ConfigMap::default();
396-
/// cluster_resources
397-
/// .add(&client, rolegroup_configmap)
398-
/// .await
399-
/// .map_err(|source| Error::AddClusterResource { source })?;
390+
/// let rolegroup_configmap = ConfigMap::default();
391+
/// cluster_resources
392+
/// .add(&client, rolegroup_configmap)
393+
/// .await
394+
/// .map_err(|source| Error::AddClusterResource { source })?;
400395
///
401-
/// let rolegroup_statefulset = StatefulSet::default();
402-
/// cluster_resources
403-
/// .add(&client, rolegroup_statefulset)
404-
/// .await
405-
/// .map_err(|source| Error::AddClusterResource { source })?;
406-
/// }
407-
/// }
396+
/// let rolegroup_statefulset = StatefulSet::default();
397+
/// cluster_resources
398+
/// .add(&client, rolegroup_statefulset)
399+
/// .await
400+
/// .map_err(|source| Error::AddClusterResource { source })?;
408401
///
409402
/// let discovery_configmap = ConfigMap::default();
410403
/// let patched_discovery_configmap = cluster_resources

0 commit comments

Comments
 (0)