Bump kube to 1.0.0 (#296)

* Bump kube to 1.0.0

Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

* Clippy/fmt fixes

Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

---------

Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

Author: Danil-Grigorev

Cargo.lock

@@ -33,8 +33,8 @@ rand = { version = "0.9", features = ["small_rng"] }
 actix-web = "4.10.2"
 futures = "0.3.28"
 tokio = { version = "1.44.2", features = ["macros", "rt-multi-thread", "process"] }
-k8s-openapi = { version = "0.24", features = ["latest", "schemars"] }
-kube = { version = "0.99.0", features = [
+k8s-openapi = { version = "0.25", features = ["latest", "schemars"] }
+kube = { version = "1.0.0", features = [
     "runtime",
     "client",
     "derive",
@@ -58,8 +58,8 @@ thiserror = "2.0.11"
 anyhow = "1.0.98"
 base64 = "0.22.1"
 clap = { version = "4.5.38", features = ["derive"] }
-cluster-api-rs = "1.9.6"
-fleet-api-rs = "0.12.2"
+cluster-api-rs = "1.10.0"
+fleet-api-rs = "0.12.3-rc.1"
 async-broadcast = "0.7.2"
 pin-project = "1.1.10"
 async-stream = "0.3.6"

Cargo.toml

@@ -123,17 +123,15 @@ impl Cluster {
                     host_network: config.host_network,
                     agent_env_vars: config.agent_env_vars.clone(),
                     ..Default::default()
-                }
-                .into(),
+                },
                 false => fleet_api_rs::fleet_cluster::ClusterSpec {
                     kube_config_secret: Some(format!("{}-kubeconfig", self.name_any())),
                     agent_namespace: config.agent_install_namespace().into(),
                     agent_tolerations: config.agent_tolerations().into(),
                     host_network: config.host_network,
                     agent_env_vars: config.agent_env_vars.clone(),
                     ..Default::default()
-                }
-                .into(),
+                },
             },
             #[cfg(not(feature = "agent-initiated"))]
             spec: fleet_api_rs::fleet_cluster::ClusterSpec {
@@ -191,8 +189,7 @@ impl Cluster {
             metadata: self.into(),
             spec: ClusterRegistrationTokenSpec {
                 ttl: Some("1h".into()),
-            }
-            .into(),
+            },
             ..Default::default()
         }
         .into()

src/api/capi_cluster.rs

@@ -8,7 +8,7 @@ use k8s_openapi::{
 use kube::{
     api::{ObjectMeta, TypeMeta},
     core::{ParseExpressionError, Selector},
-    CELSchema, CustomResource, Resource,
+    CustomResource, KubeSchema, Resource,
 };
 use schemars::JsonSchema;
 use serde::{ser, Deserialize, Serialize};
@@ -20,13 +20,13 @@ pub const EXPERIMENTAL_OCI_STORAGE: &str = "EXPERIMENTAL_OCI_STORAGE";
 pub const EXPERIMENTAL_HELM_OPS: &str = "EXPERIMENTAL_HELM_OPS";
 
 /// This provides a config for fleet addon functionality
-#[derive(CustomResource, Deserialize, Serialize, Clone, Default, Debug, CELSchema)]
+#[derive(CustomResource, Deserialize, Serialize, Clone, Default, Debug, KubeSchema)]
 #[kube(
     kind = "FleetAddonConfig",
     group = "addons.cluster.x-k8s.io",
     version = "v1alpha1",
     status = "FleetAddonConfigStatus",
-    rule = Rule::new("self.metadata.name == 'fleet-addon-config'"),
+    validation = "self.metadata.name == 'fleet-addon-config'"
 )]
 #[serde(rename_all = "camelCase")]
 pub struct FleetAddonConfigSpec {

src/api/fleet_addon_config.rs

@@ -16,8 +16,6 @@ use kube::client::scope;
 use kube::runtime::watcher::{self, Config};
 use kube::{api::ResourceExt, runtime::controller::Action, Resource};
 use kube::{Api, Client};
-#[cfg(feature = "agent-initiated")]
-use rand::distr::{Alphanumeric, SampleString as _};
 use serde::Serialize;
 use serde_json::Value;
 use tracing::info;

src/controllers/cluster.rs

@@ -24,8 +24,7 @@ async fn init_tracer() -> opentelemetry_sdk::trace::Tracer {
     let builder = SdkTracerProvider::builder();
     #[cfg(feature = "telemetry")]
     let builder = builder.with_batch_exporter(exporter);
-    builder.build()
-        .tracer("addon-provider-fleet")
+    builder.build().tracer("addon-provider-fleet")
 }
 
 /// Initialize tracing