Rename patch -> merge

sbernauer · sbernauer · commit 956d52375146 · 2025-11-24T11:55:54.000+01:00
diff --git a/crates/stackable-operator/src/crd/listener/listeners/v1alpha1_impl.rs b/crates/stackable-operator/src/crd/listener/listeners/v1alpha1_impl.rs
@@ -111,7 +111,7 @@ ports:
         )
         .unwrap();
 
-        let patch: ListenerSpec = serde_yaml::from_str(
+        let merge: ListenerSpec = serde_yaml::from_str(
             "
 className: custom-listener-class
 extraPodSelectorLabels:
@@ -125,7 +125,7 @@ publishNotReadyAddresses: false
         )
         .unwrap();
 
-        base.merge_from(patch);
+        base.merge_from(merge);
 
         let expected: ListenerSpec = serde_yaml::from_str(
             "

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ ports:`
`111`	`111`	`)`
`112`	`112`	`.unwrap();`
`113`	`113`
`114`		`- let patch: ListenerSpec = serde_yaml::from_str(`
	`114`	`+ let merge: ListenerSpec = serde_yaml::from_str(`
`115`	`115`	`"`
`116`	`116`	`className: custom-listener-class`
`117`	`117`	`extraPodSelectorLabels:`
`@@ -125,7 +125,7 @@ publishNotReadyAddresses: false`
`125`	`125`	`)`
`126`	`126`	`.unwrap();`
`127`	`127`
`128`		`- base.merge_from(patch);`
	`128`	`+ base.merge_from(merge);`
`129`	`129`
`130`	`130`	`let expected: ListenerSpec = serde_yaml::from_str(`
`131`	`131`	`"`