feat: Support jsonPatch in configOverrides

Author: siegfriedweber

Cargo.lock

@@ -15,6 +15,7 @@ stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git",
 built = { version = "0.8.0", features = ["chrono", "git2"] }
 clap = "4.5"
 futures = { version = "0.3", features = ["compat"] }
+json-patch = { version = "4.2", features = ["schemars"] }
 pretty_assertions = "1.4"
 regex = "1.11"
 rstest = "0.26"

Cargo.nix

@@ -1870,10 +1870,11 @@ spec:
                         default:
                           jsonMergePatch: {}
                         description: |-
-                          ConfigOverrides as key-value pairs, JSON merge patch or JSON object.
+                          ConfigOverrides as key-value pairs, JSON merge patch, JSON patch or JSON object.
 
-                          The key-value pairs and the JSON merge patch are merged with the configuration provided by the
-                          operator. The user provided JSON object replaces the configuration of the operator.
+                          The key-value pairs, JSON merge patch and JSON patch are merged with/applied to the
+                          configuration provided by the operator. The user-provided JSON object replaces the
+                          configuration of the operator.
 
                           Example for key-value pairs:
 
@@ -1888,6 +1889,13 @@ spec:
                                 nestedProperty:
                                   key: value
 
+                          Example for a JSON patch:
+
+                              jsonPatch:
+                                - op: replace
+                                  path: /stringProperty
+                                  value: new value
+
                           Example for a JSON object:
 
                               userProvided:
@@ -2585,10 +2593,11 @@ spec:
                               default:
                                 jsonMergePatch: {}
                               description: |-
-                                ConfigOverrides as key-value pairs, JSON merge patch or JSON object.
+                                ConfigOverrides as key-value pairs, JSON merge patch, JSON patch or JSON object.
 
-                                The key-value pairs and the JSON merge patch are merged with the configuration provided by the
-                                operator. The user provided JSON object replaces the configuration of the operator.
+                                The key-value pairs, JSON merge patch and JSON patch are merged with/applied to the
+                                configuration provided by the operator. The user-provided JSON object replaces the
+                                configuration of the operator.
 
                                 Example for key-value pairs:
 
@@ -2603,6 +2612,13 @@ spec:
                                       nestedProperty:
                                         key: value
 
+                                Example for a JSON patch:
+
+                                    jsonPatch:
+                                      - op: replace
+                                        path: /stringProperty
+                                        value: new value
+
                                 Example for a JSON object:
 
                                     userProvided:

Cargo.toml

@@ -14,6 +14,7 @@ stackable-operator.workspace = true
 
 clap.workspace = true
 futures.workspace = true
+json-patch.workspace = true
 regex.workspace = true
 serde.workspace = true
 serde_json.workspace = true

extra/crds.yaml

@@ -190,7 +190,7 @@ impl NodeConfig {
             .opensearch_yml
             .clone();
 
-        overrides.apply(&config).into_owned()
+        overrides.apply(&config)
     }
 
     /// Creates the main OpenSearch configuration file as JSON map

rust/operator-binary/Cargo.toml

@@ -630,11 +630,20 @@ mod tests {
                             termination_grace_period_seconds: 300,
                         },
                         config_overrides: ValidatedOpenSearchConfigOverrides {
-                            opensearch_yml: JsonConfigOverrides::JsonMergePatch(json!({
-                                "setting1": "value from role level",
-                                "setting2": "value from role-group level",
-                                "setting3": "value from role-group level",
-                            }),)
+                            opensearch_yml: JsonConfigOverrides::Sequence(vec![
+                                JsonConfigOverrides::JsonMergePatch(json!(
+                                    {
+                                        "setting2": "value from role-group level",
+                                        "setting3": "value from role-group level"
+                                    }
+                                )),
+                                JsonConfigOverrides::JsonMergePatch(json!(
+                                    {
+                                        "setting1": "value from role level",
+                                        "setting2": "value from role level"
+                                    }
+                                ))
+                            ]),
                         },
                         env_overrides: EnvVarSet::new().with_values([
                             (