Add docstring generation, schemars derive and ObjectReference inherit…

…ance (#56) Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>
rancher-sandbox · Jun 6, 2024 · 2f85f9e · 2f85f9e
1 parent bf38c37
commit 2f85f9e
Show file tree

Hide file tree

Showing 9 changed files with 2,020 additions and 205 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,7 +33,7 @@ rand = { version = "0.8", features = ["small_rng"] }
 actix-web = "4.4.0"
 futures = "0.3.28"
 tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread"] }
-k8s-openapi = { version = "0.22", features = ["latest"] }
+k8s-openapi = { version = "0.22", features = ["latest", "schemars"] }
 kube = { version = "0.91", features = ["runtime", "client", "derive"]}
 schemars = { version = "0.8.12", features = ["chrono"] }
 serde = { version = "1.0.202", features = ["derive"] }

diff --git a/justfile b/justfile
@@ -32,7 +32,7 @@ generate-crds: _create-out-dir _install-kopium _download-yq
 
 [private]
 _generate-kopium-url kpath="" source="" dest="" yqexp="." condition="":
-    curl -sSL {{source}} | yq '{{yqexp}}' | {{kpath}} -D Default {{condition}} -f - > {{dest}}
+    curl -sSL {{source}} | yq '{{yqexp}}' | {{kpath}} -D Default {{condition}} -A -d -f - > {{dest}}
 
 generate-addon-crds features="":
     cargo run --features={{features}} --bin crdgen > config/crds/fleet-addon-config.yaml
@@ -190,7 +190,7 @@ _install-kopium:
     #!/usr/bin/env bash
     set -euxo pipefail
     [ -z `which kopium` ] || [ {{REFRESH_BIN}} != "0" ] || exit 0
-    cargo install --git https://github.com/kube-rs/kopium.git --tag 0.19.0 --root {{OUT_DIR}}
+    cargo install --git https://github.com/kube-rs/kopium.git --root {{OUT_DIR}}
 
 download-kustomize: _download-kustomize
 

diff --git a/src/api/capi_cluster.rs b/src/api/capi_cluster.rs
diff --git a/src/api/capi_clusterclass.rs b/src/api/capi_clusterclass.rs
diff --git a/src/api/fleet_cluster.rs b/src/api/fleet_cluster.rs
diff --git a/src/api/fleet_cluster_registration_token.rs b/src/api/fleet_cluster_registration_token.rs
@@ -1,29 +1,33 @@
 // WARNING: generated by kopium - manual changes will be overwritten
-// kopium command: kopium -D Default -f -
-// kopium version: 0.19.0
+// kopium command: kopium -D Default -A -d -f -
+// kopium version: 0.20.1
 
 #[allow(unused_imports)]
 mod prelude {
     pub use kube::CustomResource;
+    pub use schemars::JsonSchema;
     pub use serde::{Serialize, Deserialize};
 }
 use self::prelude::*;
 
-#[derive(CustomResource, Serialize, Deserialize, Clone, Debug, Default)]
+#[derive(CustomResource, Serialize, Deserialize, Clone, Debug, Default, JsonSchema)]
 #[kube(group = "fleet.cattle.io", version = "v1alpha1", kind = "ClusterRegistrationToken", plural = "clusterregistrationtokens")]
 #[kube(namespaced)]
 #[kube(status = "ClusterRegistrationTokenStatus")]
-#[kube(schema = "disabled")]
 #[kube(derive="Default")]
 pub struct ClusterRegistrationTokenSpec {
+    /// TTL is the time to live for the token. It is used to calculate the
+    /// expiration time. If the token expires, it will be deleted.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub ttl: Option<String>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, Default)]
+#[derive(Serialize, Deserialize, Clone, Debug, Default, JsonSchema)]
 pub struct ClusterRegistrationTokenStatus {
+    /// Expires is the time when the token expires.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub expires: Option<String>,
+    /// SecretName is the name of the secret containing the token.
     #[serde(default, skip_serializing_if = "Option::is_none", rename = "secretName")]
     pub secret_name: Option<String>,
 }