Merge pull request #115 from CleverCloud/devel/fdubois/chore/update-deps

chore: update dependencies

Cargo.toml

@@ -13,37 +13,37 @@ readme = "README.md"
 keywords = ["kubernetes", "operator", "clevercloud", "openshift"]
 
 [dependencies]
-async-trait = "^0.1.66"
-base64 = "^0.21.0"
-chrono = { version = "^0.4.24", default-features = false }
-clap = { version = "^4.1.8", features = ["derive"] }
-clevercloud-sdk = { version = "^0.10.13", features = ["jsonschemas"] }
+async-trait = "^0.1.68"
+base64 = "^0.21.2"
+chrono = { version = "^0.4.26", default-features = false }
+clap = { version = "^4.3.0", features = ["derive"] }
+clevercloud-sdk = { version = "^0.11.0", features = ["jsonschemas"] }
 config = "^0.13.3"
-futures = "^0.3.27"
+futures = "^0.3.28"
 hostname = "^0.3.1"
-hyper = { version = "^0.14.25", default-features = false, features = ["server", "tcp", "http1"] }
-json-patch = "^0.3.0"
-kube = { version = "^0.80.0", default-features = false, features = [
+hyper = { version = "^0.14.26", default-features = false, features = ["server", "tcp", "http1"] }
+json-patch = "^1.0.0"
+kube = { version = "^0.82.2", default-features = false, features = [
     "client",
     "rustls-tls",
     "ws",
     "gzip",
     "derive",
     "jsonpatch",
+    "runtime",
 ] }
-kube-derive = "^0.80.0"
-kube-runtime = "^0.80.0"
-k8s-openapi = { version = "^0.17.0", default-features = false, features = [
+k8s-openapi = { version = "^0.18.0", default-features = false, features = [
     "v1_24",
 ] }
-once_cell = { version = "^1.17.1", optional = true }
-opentelemetry = { version = "^0.18.0", features = [
+once_cell = { version = "^1.18.0", optional = true }
+opentelemetry = { version = "^0.19.0", features = [
     "rt-tokio",
 ], optional = true }
-opentelemetry-jaeger = { version = "^0.17.0", features = [
+opentelemetry-jaeger = { version = "^0.18.0", features = [
     "rt-tokio",
     "collector_client",
-    "hyper_tls_collector_client",
+    "reqwest_collector_client",
+    "reqwest_rustls_collector_client"
 ], optional = true }
 paw = "^1.0.0"
 prometheus = { version = "^0.13.3", optional = true }
@@ -54,21 +54,21 @@ schemars = { version = "^0.8.12", features = [
     "bytes",
     "url",
 ] }
-sentry = { version = "^0.30.0", default-features = false, features = ["backtrace", "contexts", "panic", "reqwest", "rustls"], optional = true }
-sentry-types = { version = "^0.30.0", optional = true }
-sentry-tracing = { version = "^0.30.0", optional = true }
-serde = { version = "1.0.155", features = ["derive"] }
-serde_json = { version = "^1.0.94", features = [
+sentry = { version = "^0.31.3", default-features = false, features = ["backtrace", "contexts", "panic", "reqwest", "rustls"], optional = true }
+sentry-types = { version = "^0.31.3", optional = true }
+sentry-tracing = { version = "^0.31.3", optional = true }
+serde = { version = "1.0.163", features = ["derive"] }
+serde_json = { version = "^1.0.96", features = [
     "preserve_order",
     "float_roundtrip",
 ] }
-serde_yaml = "^0.9.19"
-tempfile = "^3.4.0"
-thiserror = "^1.0.39"
-tokio = { version = "^1.26.0", features = ["full"] }
+serde_yaml = "^0.9.21"
+tempfile = "^3.5.0"
+thiserror = "^1.0.40"
+tokio = { version = "^1.28.2", features = ["full"] }
 tracing = "^0.1.37"
-tracing-subscriber = { version = "^0.3.16", default-features = false, features = ["std", "ansi"] }
-tracing-opentelemetry = { version = "^0.18.0", optional = true }
+tracing-subscriber = { version = "^0.3.17", default-features = false, features = ["std", "ansi"] }
+tracing-opentelemetry = { version = "^0.19.0", optional = true }
 
 [features]
 default = [

src/logging.rs

@@ -51,7 +51,7 @@ pub mod tracer {
             .with_service_name(env!("CARGO_PKG_NAME"))
             .with_instrumentation_library_tags(true)
             .with_timeout(std::time::Duration::from_secs(600))
-            .with_hyper()
+            .with_reqwest()
             .with_trace_config(
                 trace::config()
                     .with_sampler(Sampler::AlwaysOn)

src/svc/clevercloud/client.rs

@@ -4,7 +4,7 @@
 
 use base64::{engine::general_purpose::STANDARD as BASE64_ENGINE, Engine};
 use clevercloud_sdk::oauth10a::{
-    connector::{GaiResolver, HttpsConnector, ProxyConnector},
+    connector::{GaiResolver, HttpsConnector, HttpsConnectorBuilder, ProxyConnector},
     proxy::{self, ProxyBuilder, ProxyConnectorBuilder},
     Credentials,
 };
@@ -89,9 +89,13 @@ pub fn try_new(credentials: Credentials, proxy: &Option<Proxy>) -> Result<Client
                 proxy.no.to_owned(),
             )?;
 
-            ProxyConnectorBuilder::default()
-                .with_proxy(proxy)
-                .build(HttpsConnector::new())?
+            ProxyConnectorBuilder::default().with_proxy(proxy).build(
+                HttpsConnectorBuilder::new()
+                    .with_webpki_roots()
+                    .https_or_http()
+                    .enable_http1()
+                    .build(),
+            )?
         }
         _ => ProxyConnectorBuilder::try_from_env()?,
     };

src/svc/crd/config_provider.rs

@@ -21,9 +21,10 @@ use clevercloud_sdk::{
 };
 use futures::TryFutureExt;
 use k8s_openapi::api::core::v1::Secret;
-use kube::{api::ListParams, Api, Resource, ResourceExt};
-use kube_derive::CustomResource;
-use kube_runtime::{controller, watcher, Controller};
+use kube::{
+    runtime::{controller, watcher, Controller},
+    Api, CustomResource, Resource, ResourceExt,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, error, info};
@@ -239,7 +240,11 @@ pub struct Reconciler {}
 
 impl ControllerBuilder<ConfigProvider> for Reconciler {
     fn build(&self, state: Arc<Context>) -> Controller<ConfigProvider> {
-        Controller::new(Api::all(state.kube.to_owned()), ListParams::default())
+        let client = state.kube.to_owned();
+        let secret = Api::<Secret>::all(client.to_owned());
+
+        Controller::new(Api::all(client), watcher::Config::default())
+            .owns(secret, watcher::Config::default())
     }
 }
 

src/svc/crd/elasticsearch.rs

@@ -20,9 +20,10 @@ use clevercloud_sdk::{
 };
 use futures::TryFutureExt;
 use k8s_openapi::api::core::v1::Secret;
-use kube::{api::ListParams, Api, Resource, ResourceExt};
-use kube_derive::CustomResource;
-use kube_runtime::{controller, watcher, Controller};
+use kube::{
+    runtime::{controller, watcher, Controller},
+    Api, CustomResource, Resource, ResourceExt,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, error, info};
@@ -290,7 +291,11 @@ pub struct Reconciler {}
 
 impl ControllerBuilder<ElasticSearch> for Reconciler {
     fn build(&self, state: Arc<Context>) -> Controller<ElasticSearch> {
-        Controller::new(Api::all(state.kube.to_owned()), ListParams::default())
+        let client = state.kube.to_owned();
+        let secret = Api::<Secret>::all(client.to_owned());
+
+        Controller::new(Api::all(client), watcher::Config::default())
+            .owns(secret, watcher::Config::default())
     }
 }
 

src/svc/crd/mongodb.rs

@@ -20,9 +20,10 @@ use clevercloud_sdk::{
 };
 use futures::TryFutureExt;
 use k8s_openapi::api::core::v1::Secret;
-use kube::{api::ListParams, Api, Resource, ResourceExt};
-use kube_derive::CustomResource;
-use kube_runtime::{controller, watcher, Controller};
+use kube::{
+    runtime::{controller, watcher, Controller},
+    Api, CustomResource, Resource, ResourceExt,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, error, info};
@@ -268,7 +269,11 @@ pub struct Reconciler {}
 
 impl ControllerBuilder<MongoDb> for Reconciler {
     fn build(&self, state: Arc<Context>) -> Controller<MongoDb> {
-        Controller::new(Api::all(state.kube.to_owned()), ListParams::default())
+        let client = state.kube.to_owned();
+        let secret = Api::<Secret>::all(client.to_owned());
+
+        Controller::new(Api::all(client), watcher::Config::default())
+            .owns(secret, watcher::Config::default())
     }
 }
 

src/svc/crd/mysql.rs

@@ -20,9 +20,10 @@ use clevercloud_sdk::{
 };
 use futures::TryFutureExt;
 use k8s_openapi::api::core::v1::Secret;
-use kube::{api::ListParams, Api, Resource, ResourceExt};
-use kube_derive::CustomResource;
-use kube_runtime::{controller, watcher, Controller};
+use kube::{
+    runtime::{controller, watcher, Controller},
+    Api, CustomResource, Resource, ResourceExt,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, error, info};
@@ -268,7 +269,11 @@ pub struct Reconciler {}
 
 impl ControllerBuilder<MySql> for Reconciler {
     fn build(&self, state: Arc<Context>) -> Controller<MySql> {
-        Controller::new(Api::all(state.kube.to_owned()), ListParams::default())
+        let client = state.kube.to_owned();
+        let secret = Api::<Secret>::all(client.to_owned());
+
+        Controller::new(Api::all(client), watcher::Config::default())
+            .owns(secret, watcher::Config::default())
     }
 }
 

src/svc/crd/postgresql.rs

@@ -20,9 +20,10 @@ use clevercloud_sdk::{
 };
 use futures::TryFutureExt;
 use k8s_openapi::api::core::v1::Secret;
-use kube::{api::ListParams, Api, Resource, ResourceExt};
-use kube_derive::CustomResource;
-use kube_runtime::{controller, watcher, Controller};
+use kube::{
+    runtime::{controller, watcher, Controller},
+    Api, CustomResource, Resource, ResourceExt,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, error, info};
@@ -268,7 +269,11 @@ pub struct Reconciler {}
 
 impl ControllerBuilder<PostgreSql> for Reconciler {
     fn build(&self, state: Arc<Context>) -> Controller<PostgreSql> {
-        Controller::new(Api::all(state.kube.to_owned()), ListParams::default())
+        let client = state.kube.to_owned();
+        let secret = Api::<Secret>::all(client.to_owned());
+
+        Controller::new(Api::all(client), watcher::Config::default())
+            .owns(secret, watcher::Config::default())
     }
 }
 

src/svc/crd/pulsar.rs

@@ -17,9 +17,10 @@ use clevercloud_sdk::{
 };
 use futures::TryFutureExt;
 use k8s_openapi::api::core::v1::Secret;
-use kube::{api::ListParams, Api, Resource, ResourceExt};
-use kube_derive::CustomResource;
-use kube_runtime::{controller, watcher, Controller};
+use kube::{
+    runtime::{controller, watcher, Controller},
+    Api, CustomResource, Resource, ResourceExt,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, error, info};
@@ -240,7 +241,11 @@ pub struct Reconciler {}
 
 impl ControllerBuilder<Pulsar> for Reconciler {
     fn build(&self, state: Arc<Context>) -> Controller<Pulsar> {
-        Controller::new(Api::all(state.kube.to_owned()), ListParams::default())
+        let client = state.kube.to_owned();
+        let secret = Api::<Secret>::all(client.to_owned());
+
+        Controller::new(Api::all(client), watcher::Config::default())
+            .owns(secret, watcher::Config::default())
     }
 }
 

src/svc/crd/redis.rs

@@ -20,9 +20,10 @@ use clevercloud_sdk::{
 };
 use futures::TryFutureExt;
 use k8s_openapi::api::core::v1::Secret;
-use kube::{api::ListParams, Api, Resource, ResourceExt};
-use kube_derive::CustomResource;
-use kube_runtime::{controller, watcher, Controller};
+use kube::{
+    runtime::{controller, watcher, Controller},
+    Api, CustomResource, Resource, ResourceExt,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, error, info};
@@ -268,7 +269,11 @@ pub struct Reconciler {}
 
 impl ControllerBuilder<Redis> for Reconciler {
     fn build(&self, state: Arc<Context>) -> Controller<Redis> {
-        Controller::new(Api::all(state.kube.to_owned()), ListParams::default())
+        let client = state.kube.to_owned();
+        let secret = Api::<Secret>::all(client.to_owned());
+
+        Controller::new(Api::all(client), watcher::Config::default())
+            .owns(secret, watcher::Config::default())
     }
 }
 

src/svc/k8s/mod.rs

@@ -6,13 +6,14 @@
 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},
-    watcher, Controller,
+use kube::{
+    runtime::{
+        controller::{self, Action},
+        watcher, Controller,
+    },
+    CustomResourceExt, Resource, ResourceExt,
 };
 #[cfg(feature = "metrics")]
 use once_cell::sync::Lazy;