chore/bump-operator-rs-0.67-and-deps (#495)

adwk67 · maltesander · web-flow · commit 4df72c265e21 · 2024-05-10T12:40:25.000Z
* bumped dependencies and refactored

* reorganized imports

* regenerate charts

* finish up bump to 0.67.1

* adress review comments

---------

Co-authored-by: Malte Sander &lt;contact@maltesander.com&gt;
Co-authored-by: Malte Sander &lt;malte.sander.it@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,19 +11,19 @@ repository = "https://github.com/stackabletech/superset-operator"
 
 [workspace.dependencies]
 anyhow = "1.0"
-built = { version = "0.6", features = ["chrono", "git2"] }
-clap = "4.3"
+built = { version = "0.7", features = ["chrono", "git2"] }
+clap = "4.5"
 fnv = "1.0"
 futures = { version = "0.3", features = ["compat"] }
 indoc = "2.0"
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.6.0" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
-snafu = "0.7"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.64.0" }
-strum = { version = "0.25", features = ["derive"] }
-tokio = { version = "1.29", features = ["full"] }
+snafu = "0.8"
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.67.1" }
+strum = { version = "0.26", features = ["derive"] }
+tokio = { version = "1.37", features = ["full"] }
 tracing = "0.1"
 
 # [patch."https://github.com/stackabletech/operator-rs.git"]
diff --git a/crate-hashes.json b/crate-hashes.json
diff --git a/deploy/helm/superset-operator/crds/crds.yaml b/deploy/helm/superset-operator/crds/crds.yaml
diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs
@@ -81,9 +81,8 @@ mod tests {
                                         )
                                     ]))
                                 }),
-                                namespace_selector: None,
-                                namespaces: None,
                                 topology_key: "kubernetes.io/hostname".to_string(),
+                                ..PodAffinityTerm::default()
                             },
                             weight: 70
                         }
diff --git a/rust/crd/src/authentication.rs b/rust/crd/src/authentication.rs
@@ -9,7 +9,6 @@ use stackable_operator::{
         oidc::{self, IdentityProviderHint},
         AuthenticationClass, AuthenticationClassProvider, ClientAuthenticationDetails,
     },
-    error::OperatorResult,
     schemars::{self, JsonSchema},
 };
 use tracing::info;
@@ -29,7 +28,7 @@ pub enum Error {
 
     #[snafu(display("failed to retrieve AuthenticationClass"))]
     AuthenticationClassRetrievalFailed {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
 
     #[snafu(display("only one authentication type at a time is supported by Superset, see https://github.com/dpgaspar/Flask-AppBuilder/issues/1924"))]
@@ -63,7 +62,7 @@ pub enum Error {
 
     #[snafu(display("invalid OIDC configuration"))]
     OidcConfigurationInvalid {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::commons::authentication::Error,
     },
 
     #[snafu(display("the OIDC provider {oidc_provider:?} is not yet supported (AuthenticationClass {auth_class_name:?})"))]
@@ -162,7 +161,7 @@ impl SupersetClientAuthenticationDetailsResolved {
         resolve_auth_class: impl Fn(ClientAuthenticationDetails) -> R,
     ) -> Result<SupersetClientAuthenticationDetailsResolved>
     where
-        R: Future<Output = OperatorResult<AuthenticationClass>>,
+        R: Future<Output = Result<AuthenticationClass, stackable_operator::client::Error>>,
     {
         let mut resolved_auth_classes = Vec::new();
         let mut user_registration = None;
@@ -770,7 +769,7 @@ mod tests {
                 invalid OIDC configuration
 
                 Caused by this error:
-                  1: OIDC authentication details not specified. The AuthenticationClass "oidc" uses an OIDC provider, you need to specify OIDC authentication details (such as client credentials) as well"#
+                  1: authentication details for OIDC were not specified. The AuthenticationClass "oidc" uses an OIDC provider, you need to specify OIDC authentication details (such as client credentials) as well"#
             },
             error_message
         );
@@ -931,7 +930,9 @@ mod tests {
         auth_classes: Vec<AuthenticationClass>,
     ) -> impl Fn(
         ClientAuthenticationDetails,
-    ) -> Pin<Box<dyn Future<Output = OperatorResult<AuthenticationClass>>>> {
+    ) -> Pin<
+        Box<dyn Future<Output = Result<AuthenticationClass, stackable_operator::client::Error>>>,
+    > {
         move |auth_details: ClientAuthenticationDetails| {
             let auth_classes = auth_classes.clone();
             Box::pin(async move {
@@ -942,7 +943,7 @@ mod tests {
                             == Some(auth_details.authentication_class_name())
                     })
                     .cloned()
-                    .ok_or_else(|| stackable_operator::error::Error::KubeError {
+                    .ok_or_else(|| stackable_operator::client::Error::ListResources {
                         source: kube::Error::Api(kube::error::ErrorResponse {
                             code: 404,
                             message: "AuthenticationClass not found".into(),
diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs
@@ -18,7 +18,7 @@ use stackable_operator::{
     k8s_openapi::apimachinery::pkg::api::resource::Quantity,
     kube::{runtime::reflector::ObjectRef, CustomResource, ResourceExt},
     memory::{BinaryMultiple, MemoryQuantity},
-    product_config_utils::{ConfigError, Configuration},
+    product_config_utils::{self, Configuration},
     product_logging::{self, spec::Logging},
     role_utils::{GenericRoleConfig, Role, RoleGroupRef},
     schemars::{self, JsonSchema},
@@ -381,7 +381,7 @@ impl Configuration for SupersetConfigFragment {
         &self,
         cluster: &Self::Configurable,
         _role_name: &str,
-    ) -> Result<BTreeMap<String, Option<String>>, ConfigError> {
+    ) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
         let mut result = BTreeMap::new();
         result.insert(
             SupersetConfig::CREDENTIALS_SECRET_PROPERTY.to_string(),
@@ -401,7 +401,7 @@ impl Configuration for SupersetConfigFragment {
         &self,
         _cluster: &Self::Configurable,
         _role_name: &str,
-    ) -> Result<BTreeMap<String, Option<String>>, ConfigError> {
+    ) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
         Ok(BTreeMap::new())
     }
 
@@ -410,7 +410,7 @@ impl Configuration for SupersetConfigFragment {
         _cluster: &Self::Configurable,
         _role_name: &str,
         file: &str,
-    ) -> Result<BTreeMap<String, Option<String>>, ConfigError> {
+    ) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
         let mut result = BTreeMap::new();
 
         if file == SUPERSET_CONFIG_FILENAME {
diff --git a/rust/operator-binary/build.rs b/rust/operator-binary/build.rs
@@ -1,13 +1,3 @@
-use std::path::PathBuf;
-
 fn main() {
-    let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR is required"));
-    built::write_built_file_with_opts(
-        // built's env module depends on a whole bunch of variables that crate2nix doesn't provide
-        // so we grab the specific env variables that we care about out ourselves instead.
-        built::Options::default().set_env(false),
-        "Cargo.toml".as_ref(),
-        &out_dir.join("built.rs"),
-    )
-    .unwrap();
+    built::write_built_file().unwrap();
 }
diff --git a/rust/operator-binary/src/controller_commons.rs b/rust/operator-binary/src/controller_commons.rs
@@ -1,5 +1,5 @@
 use stackable_operator::{
-    builder::VolumeBuilder,
+    builder::pod::volume::VolumeBuilder,
     k8s_openapi::api::core::v1::{ConfigMapVolumeSource, EmptyDirVolumeSource, Volume},
     product_logging::{
         self,
diff --git a/rust/operator-binary/src/druid_connection_controller.rs b/rust/operator-binary/src/druid_connection_controller.rs
@@ -3,7 +3,10 @@ use crate::util::{get_job_state, JobState};
 use crate::{rbac, superset_controller::DOCKER_IMAGE_BASE_NAME, APP_NAME};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
-    builder::{ContainerBuilder, ObjectMetaBuilder, PodSecurityContextBuilder},
+    builder::{
+        meta::ObjectMetaBuilder,
+        pod::{container::ContainerBuilder, security::PodSecurityContextBuilder},
+    },
     client::Client,
     commons::product_image_selection::ResolvedProductImage,
     k8s_openapi::api::{
@@ -29,7 +32,7 @@ use strum::{EnumDiscriminants, IntoStaticStr};
 pub const DRUID_CONNECTION_CONTROLLER_NAME: &str = "druid-connection";
 
 pub struct Ctx {
-    pub client: stackable_operator::client::Client,
+    pub client: Client,
 }
 
 #[derive(Snafu, Debug, EnumDiscriminants)]
@@ -38,31 +41,31 @@ pub struct Ctx {
 pub enum Error {
     #[snafu(display("failed to apply Job for Druid Connection"))]
     ApplyJob {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
     #[snafu(display("failed to update status"))]
     ApplyStatus {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
     #[snafu(display("object is missing metadata to build owner reference"))]
     ObjectMissingMetadataForOwnerRef {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::builder::meta::Error,
     },
     #[snafu(display("failed to get Druid connection string from config map {config_map}"))]
     GetDruidConnStringConfigMap {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         config_map: ObjectRef<ConfigMap>,
     },
     #[snafu(display("failed to get Druid connection string from config map"))]
     MissingDruidConnString,
     #[snafu(display("druid connection state is 'importing' but failed to find job {import_job}"))]
     GetImportJob {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         import_job: ObjectRef<Job>,
     },
     #[snafu(display("failed to check if druid discovery map exists"))]
     DruidDiscoveryCheck {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
     #[snafu(display("namespace missing on DruidConnection {druid_connection}"))]
     DruidConnectionNoNamespace {
@@ -71,15 +74,15 @@ pub enum Error {
     },
     #[snafu(display("failed to patch service account"))]
     ApplyServiceAccount {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
     #[snafu(display("failed to patch role binding"))]
     ApplyRoleBinding {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
     #[snafu(display("failed to retrieve superset cluster"))]
     SupersetClusterRetrieval {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
 }
 
@@ -189,7 +192,7 @@ pub async fn reconcile_druid_connection(
                     let resolved_product_image: ResolvedProductImage = superset_cluster
                         .spec
                         .image
-                        .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::CARGO_PKG_VERSION);
+                        .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION);
                     let job = build_import_job(
                         &superset_cluster,
                         &druid_connection,
diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs
@@ -34,8 +34,6 @@ mod util;
 
 mod built_info {
     include!(concat!(env!("OUT_DIR"), "/built.rs"));
-    pub const TARGET_PLATFORM: Option<&str> = option_env!("TARGET");
-    pub const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
 }
 
 pub const APP_PORT: u16 = 8088;
@@ -53,8 +51,8 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         Command::Crd => {
-            SupersetCluster::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
-            DruidConnection::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
+            SupersetCluster::print_yaml_schema(built_info::PKG_VERSION)?;
+            DruidConnection::print_yaml_schema(built_info::PKG_VERSION)?;
         }
         Command::Run(ProductOperatorRun {
             product_config,
@@ -70,7 +68,7 @@ async fn main() -> anyhow::Result<()> {
                 crate_description!(),
                 crate_version!(),
                 built_info::GIT_VERSION,
-                built_info::TARGET_PLATFORM.unwrap_or("unknown target"),
+                built_info::TARGET,
                 built_info::BUILT_TIME_UTC,
                 built_info::RUSTC_VERSION,
             );
diff --git a/rust/operator-binary/src/operations/graceful_shutdown.rs b/rust/operator-binary/src/operations/graceful_shutdown.rs
@@ -1,5 +1,5 @@
 use snafu::{ResultExt, Snafu};
-use stackable_operator::builder::PodBuilder;
+use stackable_operator::builder::pod::PodBuilder;
 use stackable_superset_crd::SupersetConfig;
 
 #[derive(Debug, Snafu)]
diff --git a/rust/operator-binary/src/operations/pdb.rs b/rust/operator-binary/src/operations/pdb.rs
@@ -11,12 +11,12 @@ use crate::{superset_controller::SUPERSET_CONTROLLER_NAME, OPERATOR_NAME};
 pub enum Error {
     #[snafu(display("Cannot create PodDisruptionBudget for role [{role}]"))]
     CreatePdb {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::builder::pdb::Error,
         role: String,
     },
     #[snafu(display("Cannot apply PodDisruptionBudget [{name}]"))]
     ApplyPdb {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::cluster_resources::Error,
         name: String,
     },
 }
diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs
@@ -2,7 +2,7 @@ use std::fmt::{Display, Write};
 
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
-    builder::ConfigMapBuilder,
+    builder::configmap::ConfigMapBuilder,
     client::Client,
     k8s_openapi::api::core::v1::ConfigMap,
     kube::Resource,
@@ -22,7 +22,7 @@ pub enum Error {
     ObjectHasNoNamespace,
     #[snafu(display("failed to retrieve the ConfigMap [{cm_name}]"))]
     ConfigMapNotFound {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         cm_name: String,
     },
     #[snafu(display("failed to retrieve the entry [{entry}] for ConfigMap [{cm_name}]"))]
diff --git a/rust/operator-binary/src/rbac.rs b/rust/operator-binary/src/rbac.rs
@@ -1,7 +1,11 @@
-use stackable_operator::builder::ObjectMetaBuilder;
-use stackable_operator::k8s_openapi::api::core::v1::ServiceAccount;
-use stackable_operator::k8s_openapi::api::rbac::v1::{RoleBinding, RoleRef, Subject};
-use stackable_operator::kube::{Resource, ResourceExt};
+use stackable_operator::{
+    builder::meta::ObjectMetaBuilder,
+    k8s_openapi::api::{
+        core::v1::ServiceAccount,
+        rbac::v1::{RoleBinding, RoleRef, Subject},
+    },
+    kube::{Resource, ResourceExt},
+};
 
 /// Obsolete: only used in the DB controller for historical reasons. Scheduled for deletion
 /// once the entire DB controller is deleted as discused here: <https://github.com/stackabletech/superset-operator/issues/351>
diff --git a/rust/operator-binary/src/superset_controller.rs b/rust/operator-binary/src/superset_controller.rs

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,8 @@ mod tests {`
`81`	`81`	`)`
`82`	`82`	`]))`
`83`	`83`	`}),`
`84`		`- namespace_selector: None,`
`85`		`- namespaces: None,`
`86`	`84`	`topology_key: "kubernetes.io/hostname".to_string(),`
	`85`	`+ ..PodAffinityTerm::default()`
`87`	`86`	`},`
`88`	`87`	`weight: 70`
`89`	`88`	`}`