Update dependencies

* Bump clap to 4.0.10
* Bump clevercloud-sdk to 0.10.9
* Bump kube to 0.75.0
* Bump kube-derieve to 0.75.0
* Bump kube-runtime to 0.75.0
* Bump k8s-openapi to 0.16.0
* Bump opentelemetry to 0.18.0
* Bump opentelemetry-jaeger to 0.17.0
* Bump schemars to 0.8.11
* Bump serde to 1.0.145
* Bump serde_yaml to 0.9.13
* Bump thiserror to 1.0.37
* Bump tokio to 1.21.2
* Bump tracing to 0.1.37
* Bump tracing-subscriber to 0.3.16
* Bump tracing-opentelemetry to 0.18.0

Signed-off-by: Florentin Dubois <florentin.dubois@clever-cloud.com>

Author: FlorentinDUBOIS

Cargo.lock

@@ -16,56 +16,56 @@ keywords = ["kubernetes", "operator", "clevercloud", "openshift"]
 async-trait = "^0.1.57"
 base64 = "^0.13.0"
 chrono = { version = "^0.4.22", default-features = false }
-clap = { version = "^3.2.20", features = ["derive"] }
-clevercloud-sdk = { version = "^0.10.8", features = ["jsonschemas"] }
+clap = { version = "^4.0.10", features = ["derive"] }
+clevercloud-sdk = { version = "^0.10.9", features = ["jsonschemas"] }
 config = "^0.13.2"
 futures = "^0.3.24"
 hostname = "^0.3.1"
 hyper = { version = "^0.14.20", features = ["server", "tcp", "http1"] }
 json-patch = "^0.2.6"
-kube = { version = "^0.74.0", default-features = false, features = [
+kube = { version = "^0.75.0", default-features = false, features = [
     "client",
     "rustls-tls",
     "ws",
     "gzip",
     "derive",
     "jsonpatch",
 ] }
-kube-derive = "^0.74.0"
-kube-runtime = "^0.74.0"
-k8s-openapi = { version = "^0.15.0", default-features = false, features = [
+kube-derive = "^0.75.0"
+kube-runtime = "^0.75.0"
+k8s-openapi = { version = "^0.16.0", default-features = false, features = [
     "v1_21",
 ] }
 lazy_static = { version = "^1.4.0", optional = true }
-opentelemetry = { version = "^0.17.0", features = [
+opentelemetry = { version = "^0.18.0", features = [
     "rt-tokio",
 ], optional = true }
-opentelemetry-jaeger = { version = "^0.16.0", features = [
+opentelemetry-jaeger = { version = "^0.17.0", features = [
     "rt-tokio",
     "collector_client",
 ], optional = true }
 paw = "^1.0.0"
 prometheus = { version = "^0.13.2", optional = true }
-schemars = { version = "^0.8.10", features = [
+schemars = { version = "^0.8.11", features = [
     "chrono",
     "indexmap1",
     "uuid1",
     "bytes",
     "url",
 ] }
 sentry = { version = "^0.27.0", optional = true }
-serde = { version = "1.0.144", features = ["derive"] }
+serde = { version = "1.0.145", features = ["derive"] }
 serde_json = { version = "^1.0.85", features = [
     "preserve_order",
     "float_roundtrip",
 ] }
-serde_yaml = "^0.9.11"
+serde_yaml = "^0.9.13"
 tempfile = "^3.3.0"
-thiserror = "^1.0.34"
-tokio = { version = "^1.21.0", features = ["full"] }
-tracing = "^0.1.36"
-tracing-subscriber = { version = "^0.3.15", default-features = false, features = ["std", "ansi", "tracing-log"] }
-tracing-opentelemetry = { version = "^0.17.4", optional = true }
+thiserror = "^1.0.37"
+tokio = { version = "^1.21.2", features = ["full"] }
+tracing = "^0.1.37"
+tracing-subscriber = { version = "^0.3.16", default-features = false, features = ["std", "ansi", "tracing-log"] }
+tracing-opentelemetry = { version = "^0.18.0", optional = true }
 
 [features]
 default = [

Cargo.toml

@@ -66,8 +66,7 @@ pub enum CustomResourceDefinitionError {
 
 #[derive(Subcommand, Clone, Debug)]
 pub enum CustomResourceDefinition {
-    /// View custom resource definition
-    #[clap(name = "view", aliases = &["v"])]
+    #[clap(name = "view", aliases = &["v"], about = "View custom resource definition")]
     View {
         #[clap(name = "custom-resource")]
         custom_resource: Option<CustomResource>,

src/cmd/crd.rs

@@ -72,8 +72,7 @@ pub enum Error {
 
 #[derive(Subcommand, Clone, Debug)]
 pub enum Command {
-    /// Interact with custom resource definition
-    #[clap(name = "custom-resource-definition", aliases= &["crd"], subcommand)]
+    #[clap(name = "custom-resource-definition", aliases= &["crd"], subcommand, about = "Interact with custom resource definition")]
     CustomResourceDefinition(crd::CustomResourceDefinition),
 }
 

src/cmd/mod.rs

@@ -109,19 +109,20 @@ pub(crate) async fn main(args: Args) -> Result<(), Error> {
         );
         global::set_text_map_propagator(Propagator::new());
 
-        let mut builder = opentelemetry_jaeger::new_pipeline()
-            .with_collector_endpoint(config.jaeger.endpoint.to_owned())
+        let mut builder = opentelemetry_jaeger::new_collector_pipeline()
+            .with_endpoint(config.jaeger.endpoint.to_owned())
             .with_service_name(env!("CARGO_PKG_NAME"));
 
         if let Some(user) = &config.jaeger.user {
-            builder = builder.with_collector_username(user);
+            builder = builder.with_username(user);
         }
 
         if let Some(password) = &config.jaeger.password {
-            builder = builder.with_collector_password(password);
+            builder = builder.with_password(password);
         }
 
-        let layer = tracing_opentelemetry::layer().with_tracer(builder.install_simple()?);
+        let layer = tracing_opentelemetry::layer()
+            .with_tracer(builder.install_batch(opentelemetry::runtime::Tokio)?);
 
         tracing::subscriber::set_global_default(Registry::default().with(layer))?;
     }

src/main.rs

@@ -5,13 +5,14 @@
 
 use std::fmt::Debug;
 
+use k8s_openapi::NamespaceResourceScope;
 use kube::Resource;
 
 #[cfg_attr(feature = "trace", tracing::instrument)]
 /// returns if there is the given finalizer on the resource
 pub fn contains<T>(obj: &T, finalizer: &str) -> bool
 where
-    T: Resource + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + Debug,
 {
     if let Some(finalizers) = &obj.meta().finalizers {
         finalizers.iter().any(|f| finalizer == f)
@@ -24,9 +25,9 @@ where
 /// add finalizer to the resource
 pub fn add<T>(mut obj: T, finalizer: &str) -> T
 where
-    T: Resource + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + Debug,
 {
-    if (&obj.meta().finalizers).is_some() {
+    if obj.meta().finalizers.is_some() {
         if !contains(&obj, finalizer) {
             obj.meta_mut().finalizers.as_mut().map(|finalizers| {
                 finalizers.push(finalizer.into());
@@ -44,7 +45,7 @@ where
 /// remove finalizer from the resource
 pub fn remove<T>(mut obj: T, finalizer: &str) -> T
 where
-    T: Resource + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + Debug,
 {
     if let Some(finalizers) = &obj.meta().finalizers {
         obj.meta_mut().finalizers = Some(

src/svc/k8s/finalizer.rs

@@ -8,6 +8,7 @@ use std::{error::Error, fmt::Debug, hash::Hash, sync::Arc, time::Duration};
 use async_trait::async_trait;
 
 use futures::{StreamExt, TryStreamExt};
+use k8s_openapi::NamespaceResourceScope;
 use kube::{CustomResourceExt, Resource, ResourceExt};
 use kube_runtime::{
     controller::{self, Action},
@@ -118,7 +119,7 @@ impl Context {
 /// controller [`Controller<T>`]
 pub trait ControllerBuilder<T>
 where
-    T: Resource + Clone + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + Clone + Debug,
     <T as Resource>::DynamicType: Eq + Hash,
 {
     /// returns a new created kubernetes controller
@@ -133,7 +134,14 @@ where
 #[async_trait]
 pub trait Reconciler<T>
 where
-    T: ResourceExt + CustomResourceExt + Debug + Clone + Send + Sync + 'static,
+    T: Resource<Scope = NamespaceResourceScope>
+        + ResourceExt
+        + CustomResourceExt
+        + Debug
+        + Clone
+        + Send
+        + Sync
+        + 'static,
 {
     type Error: Error + Send + Sync;
 
@@ -144,7 +152,7 @@ where
     async fn delete(ctx: Arc<Context>, obj: Arc<T>) -> Result<(), Self::Error>;
 
     /// returns a [`Action`] to perform following the given error
-    fn retry(err: &Self::Error, _ctx: Arc<Context>) -> Action {
+    fn retry(_obj: Arc<T>, err: &Self::Error, _ctx: Arc<Context>) -> Action {
         // Implements a basic reconciliation which always re-schedule the event
         // 500 ms later
         trace!("Requeue failed reconciliation for 500ms, {}", err);
@@ -240,7 +248,15 @@ where
 #[async_trait]
 pub trait Watcher<T>: ControllerBuilder<T> + Reconciler<T>
 where
-    T: DeserializeOwned + ResourceExt + CustomResourceExt + Clone + Debug + Send + Sync + 'static,
+    T: Resource<Scope = NamespaceResourceScope>
+        + ResourceExt
+        + CustomResourceExt
+        + DeserializeOwned
+        + Clone
+        + Debug
+        + Send
+        + Sync
+        + 'static,
     <T as Resource>::DynamicType: Unpin + Eq + Hash + Clone + Debug + Send + Sync,
     Self: Send + Sync + 'static,
     <Self as Reconciler<T>>::Error: WatcherError + Send + Sync,
@@ -320,7 +336,15 @@ where
 /// Blanklet implementation for [`Watcher<T>`]
 impl<T, U> Watcher<T> for U
 where
-    T: DeserializeOwned + ResourceExt + CustomResourceExt + Clone + Debug + Send + Sync + 'static,
+    T: Resource<Scope = NamespaceResourceScope>
+        + ResourceExt
+        + CustomResourceExt
+        + DeserializeOwned
+        + Clone
+        + Debug
+        + Send
+        + Sync
+        + 'static,
     <T as Resource>::DynamicType: Unpin + Eq + Hash + Clone + Debug + Send + Sync,
     U: Reconciler<T> + ControllerBuilder<T>,
     U::Error: WatcherError + Send + Sync,

src/svc/k8s/mod.rs

@@ -9,8 +9,9 @@ use chrono::Utc;
 use k8s_openapi::{
     api::core::v1::{Event, EventSource},
     apimachinery::pkg::apis::meta::v1::{MicroTime, Time},
+    NamespaceResourceScope,
 };
-use kube::{api::ObjectMeta, CustomResourceExt, ResourceExt};
+use kube::{api::ObjectMeta, CustomResourceExt, Resource, ResourceExt};
 
 use crate::svc::k8s::{recorder::Level, resource};
 
@@ -26,7 +27,7 @@ pub const EVENT_FOR: &str = "for";
 /// create a new event from the given parameters
 pub fn new<T, U>(obj: &T, kind: &Level, action: &U, message: &str) -> Event
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     let now = Utc::now();

src/svc/k8s/recorder/event.rs

@@ -13,8 +13,8 @@ use std::{
     str::FromStr,
 };
 
-use k8s_openapi::api::core::v1::Event;
-use kube::{Client, CustomResourceExt, ResourceExt};
+use k8s_openapi::{api::core::v1::Event, NamespaceResourceScope};
+use kube::{Client, CustomResourceExt, Resource, ResourceExt};
 use tracing::debug;
 #[cfg(feature = "trace")]
 use tracing::Instrument;
@@ -35,8 +35,9 @@ pub enum Error {
 // -----------------------------------------------------------------------------
 // Level enumeration
 
-#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Debug)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Debug, Default)]
 pub enum Level {
+    #[default]
     Warning,
     Normal,
 }
@@ -95,7 +96,7 @@ pub async fn record<T, U>(
     message: &str,
 ) -> Result<Event, kube::Error>
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     irecord(client, obj, kind, action, message).await
@@ -111,7 +112,7 @@ pub async fn record<T, U>(
     message: &str,
 ) -> Result<Event, kube::Error>
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     irecord(client, obj, kind, action, message)
@@ -128,7 +129,7 @@ async fn irecord<T, U>(
     message: &str,
 ) -> Result<Event, kube::Error>
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     debug!(
@@ -150,7 +151,7 @@ pub async fn normal<T, U>(
     message: &str,
 ) -> Result<Event, kube::Error>
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     inormal(client, obj, action, message).await
@@ -165,7 +166,7 @@ pub async fn normal<T, U>(
     message: &str,
 ) -> Result<Event, kube::Error>
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     inormal(client, obj, action, message)
@@ -181,7 +182,7 @@ async fn inormal<T, U>(
     message: &str,
 ) -> Result<Event, kube::Error>
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     record(client, obj, &Level::Normal, action, message).await
@@ -196,7 +197,7 @@ pub async fn warning<T, U>(
     message: &str,
 ) -> Result<Event, kube::Error>
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     iwarning(client, obj, action, message).await
@@ -211,7 +212,7 @@ pub async fn warning<T, U>(
     message: &str,
 ) -> Result<Event, kube::Error>
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     iwarning(client, obj, action, message)
@@ -227,7 +228,7 @@ async fn iwarning<T, U>(
     message: &str,
 ) -> Result<Event, kube::Error>
 where
-    T: ResourceExt + CustomResourceExt + Debug,
+    T: Resource<Scope = NamespaceResourceScope> + ResourceExt + CustomResourceExt + Debug,
     U: ToString + Debug,
 {
     record(client, obj, &Level::Warning, action, message).await