chore: Merge branch 'main' into chore/add-crd-versioning

Author: Techassi

Cargo.lock

@@ -6,12 +6,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- Add more granular telemetry related arguments to `ProductOperatorRun` ([#977]).
-  - `--no-console-output`: Disables output of `tracing` events to the console (stdout)
-  - `--rolling-logs`: Enables output `tracing` events to a rolling log file
-  - `--rolling-logs-period`: Sets the time period after which log files are rolled over
-  - `--otlp-traces`: Enables exporting of traces via OTLP
-  - `--otlp-logs`: Enables exporting of logs via OTLP
+- BREAKING: Inject vector aggregator address into vector config file using an environment variable ([#1000]).
 
 ### Changed
 
@@ -21,14 +16,35 @@ All notable changes to this project will be documented in this file.
   - The `static` authentication provider must now be imported using `r#static`.
   - Import are now more granular in general.
 
+[#968]: https://github.com/stackabletech/operator-rs/pull/968
+[#1000]: https://github.com/stackabletech/operator-rs/pull/1000
+
+## [0.89.1] - 2025-04-02
+
+### Changed
+
+- Make fields of `TelemetryArguments` public ([#998]).
+
+[#998]: https://github.com/stackabletech/operator-rs/pull/998
+
+## [0.89.0] - 2025-04-02
+
+### Added
+
+- Add more granular telemetry related arguments to `ProductOperatorRun` ([#977]).
+  - `--no-console-output`: Disables output of `tracing` events to the console (stdout)
+  - `--rolling-logs`: Enables output `tracing` events to a rolling log file
+  - `--rolling-logs-period`: Sets the time period after which log files are rolled over
+  - `--otlp-traces`: Enables exporting of traces via OTLP
+  - `--otlp-logs`: Enables exporting of logs via OTLP
+
 ### Removed
 
 - BREAKING: Remove `--tracing-target` argument and field from `ProductOperatorRun`.
   Use the new, more granular arguments instead ([#977]).
 - BREAKING: Remove `initialize_logging` helper function from `stackable_operator::logging` ([#977]).
 - Remove `opentelemetry-jaeger` dependency ([#977]).
 
-[#968]: https://github.com/stackabletech/operator-rs/pull/968
 [#977]: https://github.com/stackabletech/operator-rs/pull/977
 
 ## [0.88.0] - 2025-04-02

crates/stackable-operator/CHANGELOG.md

@@ -1,7 +1,7 @@
 [package]
 name = "stackable-operator"
 description = "Stackable Operator Framework"
-version = "0.88.0"
+version = "0.89.1"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true

crates/stackable-operator/Cargo.toml

@@ -284,23 +284,23 @@ impl ProductConfigPath {
 pub struct TelemetryArguments {
     /// Disable console output.
     #[arg(long, env)]
-    no_console_output: bool,
+    pub no_console_output: bool,
 
     /// Enable logging to rolling files located in the specified DIRECTORY.
     #[arg(long, env, value_name = "DIRECTORY", group = "rolling_logs_group")]
-    rolling_logs: Option<PathBuf>,
+    pub rolling_logs: Option<PathBuf>,
 
     /// Time PERIOD after which log files are rolled over.
     #[arg(long, env, value_name = "PERIOD", requires = "rolling_logs_group")]
-    rolling_logs_period: Option<RollingPeriod>,
+    pub rolling_logs_period: Option<RollingPeriod>,
 
     /// Enable exporting traces via OTLP.
     #[arg(long, env)]
-    otlp_traces: bool,
+    pub otlp_traces: bool,
 
     /// Enable exporting logs via OTLP.
     #[arg(long, env)]
-    otlp_logs: bool,
+    pub otlp_logs: bool,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, strum::Display, strum::EnumString, clap::ValueEnum)]

crates/stackable-operator/src/cli.rs

@@ -31,6 +31,10 @@ const SHUTDOWN_FILE: &str = "shutdown";
 
 /// File name of the Vector config file
 pub const VECTOR_CONFIG_FILE: &str = "vector.yaml";
+/// Key in the discovery ConfigMap that holds the vector aggregator address
+const VECTOR_AGGREGATOR_CM_KEY: &str = "ADDRESS";
+/// Name of the env var in the vector container that holds the vector aggregator address
+const VECTOR_AGGREGATOR_ENV_NAME: &str = "VECTOR_AGGREGATOR_ADDRESS";
 
 #[derive(Debug, Snafu)]
 pub enum LoggingError {
@@ -678,7 +682,6 @@ pub fn create_logback_config(
 /// # }
 /// #
 /// # let logging = fragment::validate::<Logging<Container>>(default_logging()).unwrap();
-/// # let vector_aggregator_address = "vector-aggregator:6000";
 /// # let role_group = RoleGroupRef {
 /// #     cluster: ObjectRef::<Pod>::new("test-cluster"),
 /// #     role: "role".into(),
@@ -702,7 +705,6 @@ pub fn create_logback_config(
 ///         product_logging::framework::VECTOR_CONFIG_FILE,
 ///         product_logging::framework::create_vector_config(
 ///             &role_group,
-///             vector_aggregator_address,
 ///             vector_log_config,
 ///         ),
 ///     );
@@ -712,7 +714,6 @@ pub fn create_logback_config(
 /// ```
 pub fn create_vector_config<T>(
     role_group: &RoleGroupRef<T>,
-    vector_aggregator_address: &str,
     config: Option<&AutomaticContainerLogConfig>,
 ) -> String
 where
@@ -1330,7 +1331,7 @@ sinks:
     inputs:
       - extended_logs
     type: vector
-    address: {vector_aggregator_address}
+    address: ${VECTOR_AGGREGATOR_ENV_NAME}
 "#,
         namespace = role_group.cluster.namespace.clone().unwrap_or_default(),
         cluster_name = role_group.cluster.name,
@@ -1386,6 +1387,7 @@ sinks:
 /// #     image_pull_policy: "Always".into(),
 /// #     pull_secrets: None,
 /// # };
+/// # let vector_aggregator_config_map_name = "vector-aggregator-discovery";
 ///
 /// let mut pod_builder = PodBuilder::new();
 /// pod_builder.metadata(ObjectMetaBuilder::default().build());
@@ -1425,6 +1427,7 @@ sinks:
 ///         "log",
 ///         logging.containers.get(&Container::Vector),
 ///         resources,
+///         vector_aggregator_config_map_name,
 ///     ).unwrap());
 /// }
 ///
@@ -1436,6 +1439,7 @@ pub fn vector_container(
     log_volume_name: &str,
     log_config: Option<&ContainerLogConfig>,
     resources: ResourceRequirements,
+    vector_aggregator_config_map_name: &str,
 ) -> Result<Container, LoggingError> {
     let log_level = if let Some(ContainerLogConfig {
         choice: Some(ContainerLogConfigChoice::Automatic(automatic_log_config)),
@@ -1473,6 +1477,11 @@ kill $vector_pid
 "
         )])
         .add_env_var("VECTOR_LOG", log_level.to_vector_literal())
+        .add_env_var_from_config_map(
+            VECTOR_AGGREGATOR_ENV_NAME,
+            vector_aggregator_config_map_name,
+            VECTOR_AGGREGATOR_CM_KEY,
+        )
         .add_volume_mount(config_volume_name, STACKABLE_CONFIG_DIR)
         .context(AddVolumeMountsSnafu)?
         .add_volume_mount(log_volume_name, STACKABLE_LOG_DIR)

crates/stackable-operator/src/product_logging/framework.rs

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.4.0] - 2025-04-02
+
 ### Added
 
 - BREAKING: Allow customization of the rolling file appender [#995].

crates/stackable-telemetry/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "stackable-telemetry"
-version = "0.3.0"
+version = "0.4.0"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true

crates/stackable-telemetry/Cargo.toml

@@ -20,34 +20,6 @@ ignore = [
     # TODO: Remove after https://github.com/RustCrypto/RSA/pull/394 is merged and v0.10.0 is released
     "RUSTSEC-2023-0071",
 
-    # https://rustsec.org/advisories/RUSTSEC-2024-0384
-    # "instant" is unmaintained
-    #
-    # The upstream "kube" crate also silenced this in https://github.com/kube-rs/kube/commit/4f1e889f265da8f19f03f60683569cae1a154fda
-    # They/we are actively working on migrating kube from backoff to backon, which removes the transitive dependency on
-    # instant, in https://github.com/kube-rs/kube/pull/1653.
-    #
-    # TODO: Remove after https://github.com/kube-rs/kube/pull/1653 is released
-    "RUSTSEC-2024-0384",
-
-    # Advisory: https://rustsec.org/advisories/RUSTSEC-2025-0012
-    # The [backoff](https://crates.io/crates/backoff) crate is no longer actively maintained. For exponential backoffs/retrying, you can use the [backon](https://crates.io/crates/backon) crate.
-    # Announcement: https://github.com/ihrwein/backoff/issues/66
-    #
-    # TODO: Remove after https://github.com/kube-rs/kube/pull/1653 is released
-    "RUSTSEC-2025-0012",
-
-    # Advisory: https://rustsec.org/advisories/RUSTSEC-2024-0436
-    # The creator of the crate `paste` has stated in the [`README.md`](https://github.com/dtolnay/paste/blob/master/README.md)
-    # that this project is not longer maintained as well as archived the repository
-    # Announcement: https://github.com/dtolnay/paste
-    #
-    # This comes in via aws-lc-rs. There is a PR open to migrate from `paste` to `concat-idents`.
-    # https://github.com/aws/aws-lc-rs/pull/723
-    #
-    # TODO: Remove after the migration is done and aws-lc-rs doesn't use paste anymore.
-    "RUSTSEC-2024-0436",
-
 ]
 
 [bans]