Remove MergedConfig (#457)

* Move common config options into CommonNodeConfig * Replace MergedConfig trait with AnyNodeConfig enum * Cowify container log config * Inline AnyNodeConfig::common_logging * Flatten common config into journalnode too * Docs * make regenerate-charts --------- Co-authored-by: Razvan-Daniel Mihai <[email protected]>
stackabletech · Jan 22, 2024 · 4b47b2c · 4b47b2c
1 parent f05d68c
commit 4b47b2c
Show file tree

Hide file tree

Showing 7 changed files with 344 additions and 413 deletions.
diff --git a/deploy/helm/hdfs-operator/crds/crds.yaml b/deploy/helm/hdfs-operator/crds/crds.yaml
@@ -107,6 +107,7 @@ spec:
                       type: object
                     config:
                       default: {}
+                      description: Configuration options that are available for all roles.
                       properties:
                         affinity:
                           default:
@@ -3614,6 +3615,7 @@ spec:
                             type: object
                           config:
                             default: {}
+                            description: Configuration options that are available for all roles.
                             properties:
                               affinity:
                                 default:
@@ -7179,6 +7181,7 @@ spec:
                       type: object
                     config:
                       default: {}
+                      description: Configuration options that are available for all roles.
                       properties:
                         affinity:
                           default:
@@ -10677,6 +10680,7 @@ spec:
                             type: object
                           config:
                             default: {}
+                            description: Configuration options that are available for all roles.
                             properties:
                               affinity:
                                 default:
@@ -14187,6 +14191,7 @@ spec:
                       type: object
                     config:
                       default: {}
+                      description: Configuration options that are available for all roles.
                       properties:
                         affinity:
                           default:
@@ -17685,6 +17690,7 @@ spec:
                             type: object
                           config:
                             default: {}
+                            description: Configuration options that are available for all roles.
                             properties:
                               affinity:
                                 default:

diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs
@@ -75,8 +75,8 @@ spec:
         let merged_config = role.merged_config(&hdfs, "default").unwrap();
 
         assert_eq!(
-            merged_config.affinity(),
-            &StackableAffinity {
+            merged_config.affinity,
+            StackableAffinity {
                 pod_affinity: Some(PodAffinity {
                     preferred_during_scheduling_ignored_during_execution: Some(vec![
                         WeightedPodAffinityTerm {
@@ -171,8 +171,8 @@ spec:
         let merged_config = HdfsRole::DataNode.merged_config(&hdfs, "default").unwrap();
 
         assert_eq!(
-            merged_config.affinity(),
-            &StackableAffinity {
+            merged_config.affinity,
+            StackableAffinity {
                 pod_affinity: Some(PodAffinity {
                     preferred_during_scheduling_ignored_during_execution: Some(vec![
                         WeightedPodAffinityTerm {