feat: remove product-config & clean up#692
Open
razvan wants to merge 15 commits into
Open
Conversation
16 tasks
maltesander
reviewed
Jun 8, 2026
maltesander
reviewed
Jun 8, 2026
maltesander
reviewed
Jun 9, 2026
Comment on lines
140
to
149
| impl KeyValueOverridesProvider for v1alpha1::ConfigOverrides { | ||
| fn get_key_value_overrides(&self, file: &str) -> BTreeMap<String, Option<String>> { | ||
| let field = match file { | ||
| SPARK_DEFAULTS_FILE_NAME => self.spark_defaults_conf.as_ref(), | ||
| SPARK_ENV_SH_FILE_NAME => self.spark_env_sh.as_ref(), | ||
| JVM_SECURITY_PROPERTIES_FILE => self.security_properties.as_ref(), | ||
| _ => None, | ||
| }; | ||
| field | ||
| .map(KeyValueConfigOverrides::as_product_config_overrides) | ||
| .unwrap_or_default() | ||
| match file { | ||
| SPARK_DEFAULTS_FILE_NAME => self.spark_defaults_conf.overrides.clone(), | ||
| SPARK_ENV_SH_FILE_NAME => self.spark_env_sh.overrides.clone(), | ||
| JVM_SECURITY_PROPERTIES_FILE => self.security_properties.overrides.clone(), | ||
| _ => BTreeMap::new(), | ||
| } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
I think we can remove this for now until we come up with a jvm solution (this is basically default behavior).
Comment on lines
+797
to
+805
| fn defined_key_value_overrides( | ||
| config_overrides: &v1alpha1::ConfigOverrides, | ||
| ) -> BTreeMap<String, String> { | ||
| config_overrides | ||
| .get_key_value_overrides(SPARK_ENV_SH_FILE_NAME) | ||
| .into_iter() | ||
| .filter_map(|(key, value)| value.map(|value| (key, value))) | ||
| .collect() | ||
| } |
Member
There was a problem hiding this comment.
This is also defined in the history controller.
Member
Author
There was a problem hiding this comment.
removed both as I refactored to_spark_env_sh_string() to make them unnecessary.
Comment on lines
+44
to
+45
| pub namespace: String, | ||
| pub owner_reference: OwnerReference, |
Member
There was a problem hiding this comment.
In other PRs and opensearch we use another type and split for the ownerref:
- namespace
String->NamespaceName - i would remove
owner_referenceand add name (typeClusterName) anduid. - Optional: add a private
metadatafield (https://github.com/stackabletech/opensearch-operator/blob/e22da414396d3bf63bb1495ac85a7223fd246dee/rust/operator-binary/src/controller.rs#L257) and implement Resource (https://github.com/stackabletech/opensearch-operator/blob/e22da414396d3bf63bb1495ac85a7223fd246dee/rust/operator-binary/src/controller.rs#L368).
Please check if this is required for e.g. connect as well.
Member
Author
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of stackabletech/issues#851