[Merged by Bors] - Upgrade to operator-rs 0.22.0

CHANGELOG.md

@@ -7,9 +7,11 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - Include chart name when installing with a custom release name ([#204], [#205]).
+- `operator-rs` `0.21.1` -> `0.22.0` ([#206]).
 
 [#204]: https://github.com/stackabletech/trino-operator/pull/204
 [#205]: https://github.com/stackabletech/trino-operator/pull/205
+[#206]: https://github.com/stackabletech/trino-operator/pull/206
 
 ## [0.6.0] - 2022-06-30
 

rust/crd/Cargo.toml

@@ -12,5 +12,5 @@ indoc = "1.0.6"
 serde = "1.0"
 serde_json = "1.0"
 snafu = "0.7"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.22.0" }
 strum = { version = "0.24", features = ["derive"] }

rust/operator-binary/Cargo.toml

@@ -19,12 +19,12 @@ serde_json = "1.0"
 serde_yaml = "0.8"
 snafu = "0.7"
 stackable-hive-crd = { path = "../crd" }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.22.0" }
 strum = { version = "0.24", features = ["derive"] }
 tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 
 [build-dependencies]
 built = { version =  "0.5", features = ["chrono", "git2"] }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.22.0" }
 stackable-hive-crd = { path = "../crd" }

rust/operator-binary/src/controller.rs

@@ -10,14 +10,14 @@ use stackable_hive_crd::{
     HIVE_PORT, HIVE_PORT_NAME, HIVE_SITE_XML, LOG_4J_PROPERTIES, METRICS_PORT, METRICS_PORT_NAME,
     STACKABLE_CONFIG_DIR, STACKABLE_RW_CONFIG_DIR,
 };
-use stackable_operator::builder::PodSecurityContextBuilder;
-use stackable_operator::builder::SecretOperatorVolumeSourceBuilder;
-use stackable_operator::commons::tls::TlsVerification;
 use stackable_operator::{
-    builder::{ConfigMapBuilder, ContainerBuilder, ObjectMetaBuilder, PodBuilder, VolumeBuilder},
+    builder::{
+        ConfigMapBuilder, ContainerBuilder, ObjectMetaBuilder, PodBuilder,
+        PodSecurityContextBuilder, SecretOperatorVolumeSourceBuilder, VolumeBuilder,
+    },
     commons::{
         s3::{S3AccessStyle, S3ConnectionDef, S3ConnectionSpec},
-        tls::CaCert,
+        tls::{CaCert, TlsVerification},
     },
     k8s_openapi::{
         api::{
@@ -32,11 +32,7 @@ use stackable_operator::{
             api::resource::Quantity, apis::meta::v1::LabelSelector, util::intstr::IntOrString,
         },
     },
-    kube::{
-        api::ObjectMeta,
-        runtime::controller::{Action, Context},
-        ResourceExt,
-    },
+    kube::{api::ObjectMeta, runtime::controller::Action, ResourceExt},
     labels::{role_group_selector_labels, role_selector_labels},
     logging::controller::ReconcilerError,
     product_config::{types::PropertyNameKind, ProductConfigManager},
@@ -147,9 +143,9 @@ impl ReconcilerError for Error {
     }
 }
 
-pub async fn reconcile_hive(hive: Arc<HiveCluster>, ctx: Context<Ctx>) -> Result<Action> {
+pub async fn reconcile_hive(hive: Arc<HiveCluster>, ctx: Arc<Ctx>) -> Result<Action> {
     tracing::info!("Starting reconcile");
-    let client = &ctx.get_ref().client;
+    let client = &ctx.client;
     let hive_version = hive_version(&hive)?;
 
     let s3_connection_def: &Option<S3ConnectionDef> = &hive.spec.s3;
@@ -181,7 +177,7 @@ pub async fn reconcile_hive(hive: Arc<HiveCluster>, ctx: Context<Ctx>) -> Result
             .into(),
         )
         .context(GenerateProductConfigSnafu)?,
-        &ctx.get_ref().product_config,
+        &ctx.product_config,
         false,
         false,
     )
@@ -637,7 +633,7 @@ pub fn hive_version(hive: &HiveCluster) -> Result<&str> {
         .context(ObjectHasNoVersionSnafu)
 }
 
-pub fn error_policy(_error: &Error, _ctx: Context<Ctx>) -> Action {
+pub fn error_policy(_error: &Error, _ctx: Arc<Ctx>) -> Action {
     Action::requeue(Duration::from_secs(5))
 }
 

rust/operator-binary/src/main.rs

@@ -5,19 +5,16 @@ mod discovery;
 use clap::Parser;
 use futures::stream::StreamExt;
 use stackable_hive_crd::{HiveCluster, APP_NAME};
-use stackable_operator::cli::{Command, ProductOperatorRun};
-use stackable_operator::logging::controller::report_controller_reconciled;
 use stackable_operator::{
+    cli::{Command, ProductOperatorRun},
     k8s_openapi::api::{
         apps::v1::StatefulSet,
         core::v1::{ConfigMap, Service},
     },
-    kube::{
-        api::ListParams,
-        runtime::{controller::Context, Controller},
-        CustomResourceExt,
-    },
+    kube::{api::ListParams, runtime::Controller, CustomResourceExt},
+    logging::controller::report_controller_reconciled,
 };
+use std::sync::Arc;
 
 mod built_info {
     include!(concat!(env!("OUT_DIR"), "/built.rs"));
@@ -83,7 +80,7 @@ async fn main() -> anyhow::Result<()> {
             .run(
                 controller::reconcile_hive,
                 controller::error_policy,
-                Context::new(controller::Ctx {
+                Arc::new(controller::Ctx {
                     client: client.clone(),
                     product_config,
                 }),