Skip to content

Commit 4d60ec9

Browse files
committed
chore: remove left over product config references
1 parent 383fb77 commit 4d60ec9

5 files changed

Lines changed: 9 additions & 44 deletions

File tree

docs/modules/hdfs/pages/reference/environment-variables.adoc

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,6 @@ docker run \
3333
oci.stackable.tech/sdp/hdfs-operator:0.0.0-dev
3434
----
3535

36-
== PRODUCT_CONFIG
37-
38-
*Default value*: `/etc/stackable/hdfs-operator/config-spec/properties.yaml`
39-
40-
*Required*: false
41-
42-
*Multiple values*: false
43-
44-
[source]
45-
----
46-
export PRODUCT_CONFIG=/foo/bar/properties.yaml
47-
stackable-hdfs-operator run
48-
----
49-
50-
or via docker:
51-
52-
----
53-
docker run \
54-
--name hdfs-operator \
55-
--network host \
56-
--env KUBECONFIG=/home/stackable/.kube/config \
57-
--env PRODUCT_CONFIG=/my/product/config.yaml \
58-
--mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
59-
oci.stackable.tech/sdp/hdfs-operator:0.0.0-dev
60-
----
61-
6236
== WATCH_NAMESPACE
6337

6438
*Default value*: All namespaces

rust/operator-binary/src/controller/build/properties/core_site.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ pub fn build(
4848
// The default (4096) hasn't changed since 2009.
4949
// Increase to 128k to allow for faster transfers.
5050
.add("io.file.buffer.size", "131072");
51-
// Rack awareness topology provider, namenode only. Previously injected via
52-
// the product-config `Configuration::compute_files`.
51+
// Rack awareness topology provider, namenode only.
5352
if role == HdfsNodeRole::Name && cluster_config.rack_awareness.is_some() {
5453
core_site.add(
5554
"net.topology.node.switch.mapping.impl",

rust/operator-binary/src/controller/build/properties/security_properties.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
//! Builds the `security.properties` (JVM security) config file.
22
//!
3-
//! The operator injects recommended JVM DNS cache TTLs (previously supplied via
4-
//! the product-config `properties.yaml`); user `configOverrides` are applied on
5-
//! top.
3+
//! The operator injects recommended JVM DNS cache TTLs.
4+
//! User `configOverrides` are applied on top.
65
76
use std::collections::BTreeMap;
87

rust/operator-binary/src/controller/validate.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
//! The validate step in the HdfsCluster controller.
22
//!
3-
//! Synchronously merges and validates the cluster spec into the typed
4-
//! [`ValidatedCluster`], consumed by `controller::build::*`. This replaces the
5-
//! product-config `transform_all_roles_to_config` /
6-
//! `validate_all_roles_and_groups_config` steps: config fragments are merged and
7-
//! validated via [`HdfsNodeRole::merged_config`], and the per-file
8-
//! `configOverrides` / `envOverrides` are merged here (role group wins).
3+
//! Synchronously merges and validates the cluster spec into the typed [`ValidatedCluster`]
4+
//! consumed by `controller::build::*`. Config fragments are merged and validated via
5+
//! [`HdfsNodeRole::merged_config`], and the per-file `configOverrides` / `envOverrides`
6+
//! are merged here (role group wins).
97
108
use std::{collections::BTreeMap, str::FromStr};
119

@@ -85,8 +83,7 @@ pub fn validate_cluster(
8583
.merged_config(hdfs, &role_group_name)
8684
.context(FailedToResolveConfigSnafu)?;
8785

88-
// Rack awareness topology labels, namenode only. Previously injected
89-
// via the product-config `Configuration::compute_env`.
86+
// Rack awareness topology labels, namenode only.
9087
if hdfs_role == HdfsNodeRole::Name {
9188
if let Some(rack_awareness) = hdfs.rackawareness_config() {
9289
env_overrides.insert("TOPOLOGY_LABELS".to_string(), rack_awareness);
@@ -127,8 +124,7 @@ pub fn validate_cluster(
127124
}
128125

129126
/// Merges the role-level and role-group-level `configOverrides` and `envOverrides`
130-
/// for every role group of a role (the role group wins). Replaces the
131-
/// product-config `transform_all_roles_to_config` step.
127+
/// for every role group of a role (the role group wins).
132128
fn collect_role_group_overrides<C>(
133129
role: Option<&Role<C, v1alpha1::HdfsConfigOverrides, GenericRoleConfig, JavaCommonConfig>>,
134130
) -> Vec<(

rust/operator-binary/src/service.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ pub enum Error {
1919
#[snafu(display("failed to build prometheus label"))]
2020
BuildPrometheusLabel { source: LabelError },
2121

22-
#[snafu(display("failed to build role-group selector label"))]
23-
BuildRoleGroupSelectorLabel { source: LabelError },
24-
2522
#[snafu(display("failed to build object meta data"))]
2623
ObjectMeta {
2724
source: stackable_operator::builder::meta::Error,

0 commit comments

Comments
 (0)