docs: consolidate upstream / v2 comments

Author: maltesander

rust/operator-binary/src/connect/crd.rs

@@ -320,9 +320,8 @@ impl v1alpha1::ServerConfig {
     }
 }
 
-// This is the equivalent to merged_config() in other ops
-// only here we only need to merge operator defaults with
-// user configuration.
+// Merges the operator defaults with the user-provided configuration to produce the resolved
+// server and executor configs.
 impl v1alpha1::SparkConnectServer {
     pub fn server_config(&self) -> Result<v1alpha1::ServerConfig, Error> {
         let defaults = v1alpha1::ServerConfig::default_config();

rust/operator-binary/src/product_logging/mod.rs

@@ -17,7 +17,7 @@ const CONSOLE_CONVERSION_PATTERN: &str = "%d{ISO8601} %p [%t] %c - %m%n";
 /// The static Vector agent configuration (`vector.yaml`).
 ///
 /// Cluster/role/role-group/namespace metadata and the file-log level are injected at runtime via
-/// the env vars set by the v2 `vector_container` (`${CLUSTER_NAME}`, `${ROLE_NAME}`,
+/// the env vars set on the Vector sidecar container (`${CLUSTER_NAME}`, `${ROLE_NAME}`,
 /// `${ROLE_GROUP_NAME}`, `${NAMESPACE}`, `${VECTOR_FILE_LOG_LEVEL}`, `${VECTOR_AGGREGATOR_ADDRESS}`,
 /// …), so this file is role-group-agnostic.
 const VECTOR_CONFIG: &str = include_str!("vector.yaml");