Fixing some merging leftovers.

Author: Maleware

CHANGELOG.md

@@ -20,7 +20,6 @@ All notable changes to this project will be documented in this file.
   the sidecar, as cache keys are built from caller-supplied parameters. Entries beyond the limit are now
   evicted least-recently-used first.
 
-
 ### Changed
 
 - OPA Pods now default to a soft anti-affinity that spreads them across nodes. This is a no-op for a
@@ -46,7 +45,8 @@ All notable changes to this project will be documented in this file.
 - BREAKING: Remove the `app.kubernetes.io/component` and `app.kubernetes.io/role-group` labels
   from the resources they don't apply to (previously set to `none` or a placeholder value):
   the role-level Service (`<cluster>-server`) and the discovery ConfigMap lose
-  `app.kubernetes.io/role-group`, and the RBAC ServiceAccount and RoleBinding lose both labels (previously `none`). Anything selecting on these label values must be adjusted. All resources can be updated in place; no manual
+  `app.kubernetes.io/role-group`, and the RBAC ServiceAccount and RoleBinding lose both labels (previously `none`).
+  Anything selecting on these label values must be adjusted. All resources can be updated in place; no manual
   deletion is required ([#880]).
 
 ### Fixed

rust/operator-binary/src/controller/build/resource/workload/daemonset.rs

@@ -479,10 +479,6 @@ mod tests {
         );
     }
 
-    // ---- Ported from spike/rif: tests covering the resource-info-fetcher sidecar and the
-    // shared log volume it has to fit into. RIF is a sidecar of OPA, so these have to keep
-    // passing as `deployment.rs` grows alongside `daemonset.rs`.
-
     #[test]
     fn test_constants() {
         // Test that dereferencing the constants does not panic.