fix: remove v2 / upstream comment refs

Author: maltesander

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

@@ -35,7 +35,7 @@ use stackable_operator::{
     },
     versioned::versioned,
 };
-use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
+use strum::{Display, EnumIter, EnumString};
 
 use crate::crd::{affinity::get_affinity, v1alpha1::ZookeeperServerRoleConfig};
 
@@ -407,16 +407,6 @@ impl v1alpha1::ZookeeperConfig {
     }
 }
 
-impl ZookeeperRole {
-    pub fn roles() -> Vec<String> {
-        let mut roles = vec![];
-        for role in Self::iter() {
-            roles.push(role.to_string())
-        }
-        roles
-    }
-}
-
 impl HasStatusCondition for v1alpha1::ZookeeperCluster {
     fn conditions(&self) -> Vec<ClusterCondition> {
         match &self.status {

rust/operator-binary/src/zk_controller.rs

@@ -529,10 +529,9 @@ mod tests {
 
     #[test]
     fn test_seeded_operator_defaults() {
-        // These values used to be injected by product-config from
-        // `deploy/config-spec/properties.yaml`. They are now seeded directly by the
-        // ConfigMap builder and must stay byte-identical (pinned by the kuttl
-        // snapshot `tests/templates/kuttl/smoke/14-assert.yaml.j2`).
+        // These values are seeded directly by the ConfigMap builder and must stay
+        // byte-identical (pinned by the kuttl snapshot
+        // `tests/templates/kuttl/smoke/14-assert.yaml.j2`).
         let zookeeper_yaml = r#"
         apiVersion: zookeeper.stackable.tech/v1alpha1
         kind: ZookeeperCluster

rust/operator-binary/src/zk_controller/build/properties/security_properties.rs

@@ -12,8 +12,7 @@ const DEFAULT_NETWORKADDRESS_CACHE_NEGATIVE_TTL: &str = "0";
 
 /// Builds the `security.properties` key/value pairs for a role group.
 ///
-/// The entire file is operator-injected (the values formerly came from
-/// `product-config`'s `properties.yaml`), plus any user `configOverrides`.
+/// The entire file is operator-injected, plus any user `configOverrides`.
 pub fn build(rolegroup_config: &ZookeeperRoleGroupConfig) -> BTreeMap<String, String> {
     let mut security_properties = BTreeMap::new();
 

rust/operator-binary/src/zk_controller/build/properties/zoo_cfg.rs

@@ -67,7 +67,7 @@ pub(crate) fn server_addresses(
 /// `server.<myid>` quorum entries (which depend on `cluster_info`).
 ///
 /// Precedence (lowest to highest):
-/// 1. operator-injected defaults (formerly `product-config` `properties.yaml`)
+/// 1. operator-injected defaults
 /// 2. TLS / quorum settings from [`ZookeeperSecurity`]
 /// 3. user-set merged config (`initLimit` / `syncLimit` / `tickTime`)
 /// 4. `configOverrides` for `zoo.cfg`

rust/operator-binary/src/zk_controller/build/resource/statefulset.rs

@@ -161,9 +161,8 @@ pub fn build_server_rolegroup_statefulset(
     let zookeeper_security = &cluster.cluster_config.zookeeper_security;
     let metrics_port = cluster.metrics_http_port(rolegroup_config);
 
-    // The operator-injected environment variables (formerly produced by the
-    // product-config `Configuration::compute_env` implementation) plus the
-    // user-provided `envOverrides` (which win on conflict).
+    // The operator-injected environment variables plus the user-provided `envOverrides`
+    // (which win on conflict).
     let env_vars = EnvVarSet::new()
         .with_value(
             &EnvVarName::from_str_unsafe(v1alpha1::ZookeeperConfig::MYID_OFFSET),
@@ -406,7 +405,7 @@ pub fn build_server_rolegroup_statefulset(
         .context(AddVolumeSnafu)?;
 
     // The static `vector.yaml` (in the rolegroup ConfigMap, mounted as the `config` volume) is
-    // parameterised at runtime via env vars that the v2 `vector_container` injects. The validated
+    // parameterised at runtime via env vars that the `vector_container` injects. The validated
     // Vector log config is built up-front in the validate step.
     if let Some(vector_log_config) = &rolegroup_config.config.logging.vector_container {
         let config_volume_name = VolumeName::from_str(CONFIG_VOLUME_NAME)

rust/operator-binary/src/zk_controller/dereference.rs

@@ -2,7 +2,7 @@
 //!
 //! Fetches all Kubernetes objects referenced by the [`v1alpha1::ZookeeperCluster`] spec and
 //! returns them in [`DereferencedObjects`]. Synchronous validation of the fetched objects
-//! (image resolution, product-config validation, security struct assembly) happens in the
+//! (image resolution, config validation, security struct assembly) happens in the
 //! validate step.
 
 use snafu::{ResultExt, Snafu};