Fix some bugs in kiss and vine

SmartX-Team · May 17, 2023 · d050bdc · d050bdc
1 parent a789c21
commit d050bdc
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 65 deletions.
diff --git a/kiss/api/src/box.rs b/kiss/api/src/box.rs
@@ -24,59 +24,53 @@ impl BoxCrd {
     struct = "BoxCrd",
     status = "BoxStatus",
     shortname = "box",
-    printcolumn = r#"{
-        "name": "alias",
-        "type": "string",
-        "description": "dash alias",
-        "jsonPath": ".metadata.annotations.\"dash.ulagbulag.io/alias\"",
-    }"#,
     printcolumn = r#"{
         "name": "address",
         "type": "string",
         "description": "access address of the box",
-        "jsonPath": ".status.access.primary.address",
+        "jsonPath": ".status.access.primary.address"
     }"#,
     printcolumn = r#"{
         "name": "power",
         "type": "string",
         "description": "power address of the box",
-        "jsonPath": ".spec.power.address",
+        "jsonPath": ".spec.power.address"
     }"#,
     printcolumn = r#"{
         "name": "cluster",
         "type": "string",
         "description": "cluster name where the box is located",
-        "jsonPath": ".spec.group.clusterName",
+        "jsonPath": ".spec.group.clusterName"
     }"#,
     printcolumn = r#"{
         "name": "role",
         "type": "string",
         "description": "role of the box",
-        "jsonPath": ".spec.group.role",
+        "jsonPath": ".spec.group.role"
     }"#,
     printcolumn = r#"{
         "name": "state",
         "type": "string",
         "description": "state of the box",
-        "jsonPath": ".status.state",
+        "jsonPath": ".status.state"
     }"#,
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
         "description": "created time of the box",
-        "jsonPath": ".metadata.creationTimestamp",
+        "jsonPath": ".metadata.creationTimestamp"
     }"#,
     printcolumn = r#"{
         "name": "updated-at",
         "type": "date",
         "description": "updated time of the box",
-        "jsonPath": ".status.lastUpdated",
+        "jsonPath": ".status.lastUpdated"
     }"#,
     printcolumn = r#"{
         "name": "network-speed",
         "type": "string",
         "description": "network interface link speed (Unit: Mbps)",
-        "jsonPath": ".status.access.primary.speedMbps",
+        "jsonPath": ".status.access.primary.speedMbps"
     }"#
 )]
 #[serde(rename_all = "camelCase")]

diff --git a/vine/api/src/user.rs b/vine/api/src/user.rs
@@ -16,26 +16,26 @@ use serde::{Deserialize, Serialize};
     printcolumn = r#"{
         "name": "real name",
         "type": "string",
-        "description":"user's real name",
-        "jsonPath":".spec.name"
+        "description": "user's real name",
+        "jsonPath": ".spec.name"
     }"#,
     printcolumn = r#"{
         "name": "email",
         "type": "string",
-        "description":"email address",
-        "jsonPath":".spec.contact.email"
+        "description": "email address",
+        "jsonPath": ".spec.contact.email"
     }"#,
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
-        "description":"created time",
-        "jsonPath":".metadata.creationTimestamp"
+        "description": "created time",
+        "jsonPath": ".metadata.creationTimestamp"
     }"#,
     printcolumn = r#"{
         "name": "updated-at",
         "type": "date",
-        "description":"updated time",
-        "jsonPath":".status.lastUpdated"
+        "description": "updated time",
+        "jsonPath": ".status.lastUpdated"
     }"#
 )]
 #[serde(rename_all = "camelCase")]

diff --git a/vine/api/src/user_auth.rs b/vine/api/src/user_auth.rs
@@ -24,8 +24,8 @@ use crate::{
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
-        "description":"created time",
-        "jsonPath":".metadata.creationTimestamp"
+        "description": "created time",
+        "jsonPath": ".metadata.creationTimestamp"
     }"#
 )]
 #[serde(rename_all = "camelCase")]

diff --git a/vine/api/src/user_auth_binding.rs b/vine/api/src/user_auth_binding.rs
@@ -13,26 +13,26 @@ use serde::{Deserialize, Serialize};
     printcolumn = r#"{
         "name": "user",
         "type": "string",
-        "description":"User name",
-        "jsonPath":".spec.user"
+        "description": "User name",
+        "jsonPath": ".spec.user"
     }"#,
     printcolumn = r#"{
         "name": "auth",
         "type": "string",
-        "description":"UserAuth name",
-        "jsonPath":".spec.auth"
+        "description": "UserAuth name",
+        "jsonPath": ".spec.auth"
     }"#,
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
-        "description":"created time",
-        "jsonPath":".metadata.creationTimestamp"
+        "description": "created time",
+        "jsonPath": ".metadata.creationTimestamp"
     }"#,
     printcolumn = r#"{
         "name": "expired-at",
         "type": "date",
-        "description":"expired time",
-        "jsonPath":".spec.expiredTimestamp"
+        "description": "expired time",
+        "jsonPath": ".spec.expiredTimestamp"
     }"#
 )]
 #[serde(rename_all = "camelCase")]

diff --git a/vine/api/src/user_box_binding.rs b/vine/api/src/user_box_binding.rs
@@ -13,32 +13,32 @@ use serde::{Deserialize, Serialize};
     printcolumn = r#"{
         "name": "user",
         "type": "string",
-        "description":"User name",
-        "jsonPath":".spec.user"
+        "description": "User name",
+        "jsonPath": ".spec.user"
     }"#,
     printcolumn = r#"{
         "name": "box",
         "type": "string",
-        "description":"Box name",
-        "jsonPath":".spec.box"
+        "description": "Box name",
+        "jsonPath": ".spec.box"
     }"#,
     printcolumn = r#"{
         "name": "autologin",
         "type": "boolean",
-        "description":"Whether the box is automatically logged-in",
-        "jsonPath":".spec.autologin"
+        "description": "Whether the box is automatically logged-in",
+        "jsonPath": ".spec.autologin"
     }"#,
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
-        "description":"created time",
-        "jsonPath":".metadata.creationTimestamp"
+        "description": "created time",
+        "jsonPath": ".metadata.creationTimestamp"
     }"#,
     printcolumn = r#"{
         "name": "expired-at",
         "type": "date",
-        "description":"expired time",
-        "jsonPath":".spec.expiredTimestamp"
+        "description": "expired time",
+        "jsonPath": ".spec.expiredTimestamp"
     }"#
 )]
 #[serde(rename_all = "camelCase")]

diff --git a/vine/api/src/user_box_quota.rs b/vine/api/src/user_box_quota.rs
@@ -13,14 +13,14 @@ use serde::{Deserialize, Serialize};
     printcolumn = r#"{
         "name": "amount",
         "type": "number",
-        "description":"the number of allowed boxes",
-        "jsonPath":".spec.amount"
+        "description": "the number of allowed boxes",
+        "jsonPath": ".spec.amount"
     }"#,
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
-        "description":"created time",
-        "jsonPath":".metadata.creationTimestamp"
+        "description": "created time",
+        "jsonPath": ".metadata.creationTimestamp"
     }"#
 )]
 #[serde(rename_all = "camelCase")]

diff --git a/vine/api/src/user_box_quota_binding.rs b/vine/api/src/user_box_quota_binding.rs
@@ -13,26 +13,26 @@ use serde::{Deserialize, Serialize};
     printcolumn = r#"{
         "name": "user",
         "type": "string",
-        "description":"User name",
-        "jsonPath":".spec.user"
+        "description": "User name",
+        "jsonPath": ".spec.user"
     }"#,
     printcolumn = r#"{
         "name": "quota",
         "type": "string",
-        "description":"UserBoxQuota name",
-        "jsonPath":".spec.quota"
+        "description": "UserBoxQuota name",
+        "jsonPath": ".spec.quota"
     }"#,
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
-        "description":"created time",
-        "jsonPath":".metadata.creationTimestamp"
+        "description": "created time",
+        "jsonPath": ".metadata.creationTimestamp"
     }"#,
     printcolumn = r#"{
         "name": "expired-at",
         "type": "date",
-        "description":"expired time",
-        "jsonPath":".spec.expiredTimestamp"
+        "description": "expired time",
+        "jsonPath": ".spec.expiredTimestamp"
     }"#
 )]
 #[serde(rename_all = "camelCase")]

diff --git a/vine/api/src/user_role.rs b/vine/api/src/user_role.rs
@@ -16,8 +16,8 @@ use serde::{Deserialize, Serialize};
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
-        "description":"created time",
-        "jsonPath":".metadata.creationTimestamp"
+        "description": "created time",
+        "jsonPath": ".metadata.creationTimestamp"
     }"#
 )]
 #[serde(rename_all = "camelCase")]

diff --git a/vine/api/src/user_role_binding.rs b/vine/api/src/user_role_binding.rs
@@ -13,26 +13,26 @@ use serde::{Deserialize, Serialize};
     printcolumn = r#"{
         "name": "user",
         "type": "string",
-        "description":"User name",
-        "jsonPath":".spec.user"
+        "description": "User name",
+        "jsonPath": ".spec.user"
     }"#,
     printcolumn = r#"{
         "name": "role",
         "type": "string",
-        "description":"UserRole name",
-        "jsonPath":".spec.role"
+        "description": "UserRole name",
+        "jsonPath": ".spec.role"
     }"#,
     printcolumn = r#"{
         "name": "created-at",
         "type": "date",
-        "description":"created time",
-        "jsonPath":".metadata.creationTimestamp"
+        "description": "created time",
+        "jsonPath": ".metadata.creationTimestamp"
     }"#,
     printcolumn = r#"{
         "name": "expired-at",
         "type": "date",
-        "description":"expired time",
-        "jsonPath":".spec.expiredTimestamp"
+        "description": "expired time",
+        "jsonPath": ".spec.expiredTimestamp"
     }"#
 )]
 #[serde(rename_all = "camelCase")]

diff --git a/vine/controller/Cargo.toml b/vine/controller/Cargo.toml
@@ -28,4 +28,4 @@ kube = { workspace = true, features = [
     "ws",
 ] }
 log = { workspace = true }
-tokio = { workspace = true }
+tokio = { workspace = true, features = ["full"] }