schemars 1 with kube pre-2 and k8s-openapi pins (#166)

* Use pinned k8s-openapi and kube for schemars 1

Signed-off-by: clux <[email protected]>

* bump edition

Signed-off-by: clux <[email protected]>

* fmt

Signed-off-by: clux <[email protected]>

---------

Signed-off-by: clux <[email protected]>

Author: clux

Cargo.lock

@@ -2,7 +2,7 @@
 name = "controller"
 version = "0.16.0"
 authors = ["clux <[email protected]>"]
-edition = "2021"
+edition = "2024"
 default-run = "controller"
 license = "Apache-2.0"
 publish = false
@@ -29,8 +29,9 @@ telemetry = ["opentelemetry-otlp"]
 actix-web = "4.11.0"
 futures = "0.3.31"
 tokio = { version = "1.46.1", features = ["macros", "rt-multi-thread"] }
-k8s-openapi = { version = "0.25.0", features = ["latest"] }
-schemars = { version = "0.8.22", features = ["chrono"] }
+#k8s-openapi = { version = "0.25.0", features = ["latest"] }
+k8s-openapi = { git = "https://github.com/Arnavion/k8s-openapi.git", rev = "e9a9eaf", features=["latest"] }
+schemars = { version = "1", features = ["chrono04"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 serde_yaml = "0.9.25"
@@ -53,10 +54,10 @@ tower-test = "0.4.0"
 
 [dependencies.kube]
 features = ["runtime", "client", "derive"]
-version = "1.1.0"
+# version = "1.1.0"
 
 # testing new releases - ignore
-# git = "https://github.com/kube-rs/kube.git"
+git = "https://github.com/kube-rs/kube.git"
 # branch = "main"
-#rev = "19b90ad3a4dbc83e1dd742847c7707333259b1bb"
-#path = "../kube/kube"
+rev = "06e843bf026d0838dca159433e8af8268b6cc0bf"
+# path = "../kube/kube"

Cargo.toml

@@ -1,16 +1,16 @@
-use crate::{telemetry, Error, Metrics, Result};
+use crate::{Error, Metrics, Result, telemetry};
 use chrono::{DateTime, Utc};
 use futures::StreamExt;
 use kube::{
+    CustomResource, Resource,
     api::{Api, ListParams, Patch, PatchParams, ResourceExt},
     client::Client,
     runtime::{
         controller::{Action, Controller},
         events::{Event, EventType, Recorder, Reporter},
-        finalizer::{finalizer, Event as Finalizer},
+        finalizer::{Event as Finalizer, finalizer},
         watcher::Config,
     },
-    CustomResource, Resource,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -233,9 +233,9 @@ pub async fn run(state: State) {
 // Mock tests relying on fixtures.rs and its primitive apiserver mocks
 #[cfg(test)]
 mod test {
-    use super::{error_policy, reconcile, Context, Document};
+    use super::{Context, Document, error_policy, reconcile};
     use crate::{
-        fixtures::{timeout_after_1s, Scenario},
+        fixtures::{Scenario, timeout_after_1s},
         metrics::ErrorLabels,
     };
     use std::sync::Arc;

src/controller.rs

@@ -1,8 +1,8 @@
 //! Helper methods only available for tests
-use crate::{Context, Document, DocumentSpec, DocumentStatus, Result, DOCUMENT_FINALIZER};
+use crate::{Context, DOCUMENT_FINALIZER, Document, DocumentSpec, DocumentStatus, Result};
 use assert_json_diff::assert_json_include;
 use http::{Request, Response};
-use kube::{client::Body, runtime::events::Recorder, Client, Resource, ResourceExt};
+use kube::{Client, Resource, ResourceExt, client::Body, runtime::events::Recorder};
 use std::sync::Arc;
 
 impl Document {

src/fixtures.rs

@@ -1,6 +1,6 @@
 #![allow(unused_imports, unused_variables)]
-use actix_web::{get, middleware, web::Data, App, HttpRequest, HttpResponse, HttpServer, Responder};
-pub use controller::{self, telemetry, State};
+use actix_web::{App, HttpRequest, HttpResponse, HttpServer, Responder, get, middleware, web::Data};
+pub use controller::{self, State, telemetry};
 
 #[get("/metrics")]
 async fn metrics(c: Data<State>, _req: HttpRequest) -> impl Responder {

src/main.rs

@@ -1,7 +1,7 @@
 #![allow(unused_imports)] // some used only for telemetry feature
 use opentelemetry::trace::{TraceId, TracerProvider};
-use opentelemetry_sdk::{runtime, trace as sdktrace, trace::Config, Resource};
-use tracing_subscriber::{prelude::*, EnvFilter, Registry};
+use opentelemetry_sdk::{Resource, runtime, trace as sdktrace, trace::Config};
+use tracing_subscriber::{EnvFilter, Registry, prelude::*};
 
 ///  Fetch an opentelemetry::trace::TraceId as hex through the full tracing stack
 pub fn get_trace_id() -> TraceId {

src/telemetry.rs

@@ -23,7 +23,9 @@ spec:
             description: |-
               Generate the Kubernetes wrapper struct `Document` from our Spec and Status struct
 
-              This provides a hook for generating the CRD yaml (in crdgen.rs) NB: CustomResource generates a pub struct Document here To query for documents.kube.rs with kube, use Api<Document>.
+              This provides a hook for generating the CRD yaml (in crdgen.rs)
+              NB: CustomResource generates a pub struct Document here
+              To query for documents.kube.rs with kube, use Api<Document>.
             properties:
               content:
                 type: string