Skip to content

Commit 0bf8d55

Browse files
maltesanderclaude
andcommitted
chore!: Drop the direct product-config dependency
Remove the Configuration impl for MetaStoreConfigFragment and the product-config crate from the workspace. product-config now only appears transitively via stackable-operator. The deploy/config-spec packaging is left in place to mirror trino-operator (it is operator-templating-managed infrastructure). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent f544de2 commit 0bf8d55

4 files changed

Lines changed: 0 additions & 49 deletions

File tree

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.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ edition = "2021"
1010
repository = "https://github.com/stackabletech/hive-operator"
1111

1212
[workspace.dependencies]
13-
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.8.0" }
1413
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.111.0", features = ["crds", "webhook"] }
1514

1615
anyhow = "1.0"

rust/operator-binary/Cargo.toml

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

1111
[dependencies]
12-
product-config.workspace = true
1312
stackable-operator.workspace = true
1413

1514
anyhow.workspace = true

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

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ use stackable_operator::{
2424
deep_merger::ObjectOverrides,
2525
k8s_openapi::apimachinery::pkg::api::resource::Quantity,
2626
kube::{CustomResource, ResourceExt, runtime::reflector::ObjectRef},
27-
product_config_utils::{self, Configuration},
2827
product_logging::{self, spec::Logging},
2928
role_utils::{GenericRoleConfig, JavaCommonConfig, Role, RoleGroup, RoleGroupRef},
3029
schemars::{self, JsonSchema},
@@ -510,51 +509,6 @@ impl MetaStoreConfig {
510509
}
511510
}
512511

513-
impl Configuration for MetaStoreConfigFragment {
514-
type Configurable = v1alpha1::HiveCluster;
515-
516-
fn compute_env(
517-
&self,
518-
_hive: &Self::Configurable,
519-
_role_name: &str,
520-
) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
521-
// Well product-config strikes again...
522-
Ok(BTreeMap::new())
523-
}
524-
525-
fn compute_cli(
526-
&self,
527-
_hive: &Self::Configurable,
528-
_role_name: &str,
529-
) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
530-
Ok(BTreeMap::new())
531-
}
532-
533-
fn compute_files(
534-
&self,
535-
_hive: &Self::Configurable,
536-
_role_name: &str,
537-
file: &str,
538-
) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
539-
let mut result = BTreeMap::new();
540-
541-
if file == HIVE_SITE_XML {
542-
if let Some(warehouse_dir) = &self.warehouse_dir {
543-
result.insert(
544-
MetaStoreConfig::METASTORE_WAREHOUSE_DIR.to_string(),
545-
Some(warehouse_dir.to_string()),
546-
);
547-
}
548-
result.insert(
549-
MetaStoreConfig::METASTORE_METRICS_ENABLED.to_string(),
550-
Some("true".to_string()),
551-
);
552-
}
553-
554-
Ok(result)
555-
}
556-
}
557-
558512
#[derive(Clone, Default, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
559513
#[serde(rename_all = "camelCase")]
560514
pub struct HiveClusterStatus {

0 commit comments

Comments
 (0)