Upgrade Vector to version 0.33.0

CHANGELOG.md

@@ -9,7 +9,7 @@
 
 ### Changed
 
-- `vector` `0.26.0` -> `0.31.0` ([#391]).
+- `vector` `0.26.0` -> `0.33.0` ([#391], [#413]).
 - `operator-rs` `0.44.0` -> `0.52.1` ([#390], [#407]).
 - BREAKING: Removed SupersetDB object, since it created some problems when reinstalling or upgrading a Superset cluster. Instead, the initialization of the database was moved to the startup phase of each Superset pod. To make sure the initialization does not run in parallel, the `PodManagementPolicy` was set to `OrderedReady` and liveness/readiness probes were added. The `.spec.clusterConfig.loadExamplesOnInit` option was removed from the CRD, because loading the examples at every startup caused problems in certain scenarios, e.g. after an upgrade from Superset 1.5.3 to 2.1.0 ([#396]).
 
@@ -22,6 +22,7 @@
 [#394]: https://github.com/stackabletech/superset-operator/pull/394
 [#396]: https://github.com/stackabletech/superset-operator/pull/396
 [#407]: https://github.com/stackabletech/superset-operator/pull/407
+[#413]: https://github.com/stackabletech/superset-operator/pull/413
 
 ## [23.7.0] - 2023-07-14
 

Cargo.toml

@@ -26,5 +26,5 @@ strum = { version = "0.25", features = ["derive"] }
 tokio = { version = "1.29", features = ["full"] }
 tracing = "0.1"
 
-# [patch."https://github.com/stackabletech/operator-rs.git"]
-# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
+[patch."https://github.com/stackabletech/operator-rs.git"]
+stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "upgrade-vector" }

rust/operator-binary/src/product_logging.rs

@@ -1,4 +1,4 @@
-use std::fmt::Display;
+use std::fmt::{Display, Write};
 
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
@@ -126,13 +126,14 @@ fn create_superset_config(log_config: &AutomaticContainerLogConfig, log_dir: &st
  .loggers
  .iter()
  .filter(|(name, _)| name.as_str() != AutomaticContainerLogConfig::ROOT_LOGGER)
- .map(|(name, config)| {
- format!(
- " logging.getLogger('{name}').setLevel({level})\n",
+ .fold(String::new(), |mut output, (name, config)| {
+ let _ = writeln!(
+ output,
+ " logging.getLogger('{name}').setLevel({level})",
  level = config.level.to_python_expression()
- )
- })
- .collect::<String>();
+ );
+  output
+ });
 
  format!(
  "\

tests/templates/kuttl/logging/01-install-superset-vector-aggregator.yaml

@@ -5,7 +5,7 @@ commands:
  - script: >-
  helm install superset-vector-aggregator vector
  --namespace $NAMESPACE
- --version 0.23.0
+ --version 0.26.0
  --repo https://helm.vector.dev
  --values superset-vector-aggregator-values.yaml
 ---