Skip to content

Commit

Permalink
Fix tokio dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@HoKim98
HoKim98 committed May 17, 2023
1 parent d322fe3 commit a789c21
Show file tree
Hide file tree
Showing 12 changed files with 56 additions and 50 deletions.
8 changes: 4 additions & 4 deletions ark/api/src/package.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ use strum::{Display, EnumString};
printcolumn = r#"{
"name": "state",
"type": "string",
"description":"state of the package",
"jsonPath":".status.state"
"description": "state of the package",
"jsonPath": ".status.state"
}"#,
printcolumn = r#"{
"name": "created-at",
"type": "date",
"description":"created time",
"jsonPath":".metadata.creationTimestamp"
"description": "created time",
"jsonPath": ".metadata.creationTimestamp"
}"#
)]
#[serde(rename_all = "camelCase")]
Expand Down
2 changes: 1 addition & 1 deletion ark/controller/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ kube = { workspace = true, features = [
log = { workspace = true }
regex = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }
tokio = { workspace = true, features = ["full"] }
8 changes: 4 additions & 4 deletions dash/api/src/function.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ use crate::model::{ModelFieldKindNativeSpec, ModelFieldKindSpec, ModelFieldsSpec
printcolumn = r#"{
"name": "state",
"type": "string",
"description":"state of the function",
"jsonPath":".status.state"
"description": "state of the function",
"jsonPath": ".status.state"
}"#,
printcolumn = r#"{
"name": "created-at",
"type": "date",
"description":"created time",
"jsonPath":".metadata.creationTimestamp"
"description": "created time",
"jsonPath": ".metadata.creationTimestamp"
}"#
)]
#[serde(rename_all = "camelCase")]
Expand Down
16 changes: 8 additions & 8 deletions dash/api/src/model.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@ use strum::{Display, EnumString};
printcolumn = r#"{
"name": "state",
"type": "string",
"description":"state of the model",
"jsonPath":".status.state"
"description": "state of the model",
"jsonPath": ".status.state"
}"#,
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"
}"#,
printcolumn = r#"{
"name": "version",
"type": "date",
"description":"model version",
"jsonPath":".metadata.generation"
"description": "model version",
"jsonPath": ".metadata.generation"
}"#
)]
#[serde(rename_all = "camelCase")]
Expand Down
12 changes: 6 additions & 6 deletions dash/api/src/model_storage_binding.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ use crate::{model::ModelSpec, storage::ModelStorageSpec};
printcolumn = r#"{
"name": "state",
"type": "string",
"description":"state of the binding",
"jsonPath":".status.state"
"description": "state of the binding",
"jsonPath": ".status.state"
}"#,
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")]
Expand Down
12 changes: 6 additions & 6 deletions dash/api/src/storage/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ use strum::{Display, EnumString};
printcolumn = r#"{
"name": "state",
"type": "string",
"description":"state of the model storage",
"jsonPath":".status.state"
"description": "state of the model storage",
"jsonPath": ".status.state"
}"#,
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")]
Expand Down
2 changes: 1 addition & 1 deletion dash/controller/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ kube = { workspace = true, features = [
log = { workspace = true }
regex = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }
tokio = { workspace = true, features = ["full"] }
38 changes: 22 additions & 16 deletions kiss/api/src/box.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,53 +24,59 @@ 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"
"description": "access address of the box",
"jsonPath": ".status.access.primary.address",
}"#,
printcolumn = r#"{
"name": "power",
"type": "string",
"description":"power address of the box",
"jsonPath":".spec.power.address"
"description": "power address of the box",
"jsonPath": ".spec.power.address",
}"#,
printcolumn = r#"{
"name": "cluster",
"type": "string",
"description":"cluster name where the box is located",
"jsonPath":".spec.group.clusterName"
"description": "cluster name where the box is located",
"jsonPath": ".spec.group.clusterName",
}"#,
printcolumn = r#"{
"name": "role",
"type": "string",
"description":"role of the box",
"jsonPath":".spec.group.role"
"description": "role of the box",
"jsonPath": ".spec.group.role",
}"#,
printcolumn = r#"{
"name": "state",
"type": "string",
"description":"state of the box",
"jsonPath":".status.state"
"description": "state of the box",
"jsonPath": ".status.state",
}"#,
printcolumn = r#"{
"name": "created-at",
"type": "date",
"description":"created time of the box",
"jsonPath":".metadata.creationTimestamp"
"description": "created time of the box",
"jsonPath": ".metadata.creationTimestamp",
}"#,
printcolumn = r#"{
"name": "updated-at",
"type": "date",
"description":"updated time of the box",
"jsonPath":".status.lastUpdated"
"description": "updated time of the box",
"jsonPath": ".status.lastUpdated",
}"#,
printcolumn = r#"{
"name": "network-speed",
"type": "string",
"description":"network interface link speed (Unit: Mbps)",
"jsonPath":".status.access.primary.speedMbps"
"description": "network interface link speed (Unit: Mbps)",
"jsonPath": ".status.access.primary.speedMbps",
}"#
)]
#[serde(rename_all = "camelCase")]
Expand Down
2 changes: 1 addition & 1 deletion kiss/controller/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ kube = { workspace = true, features = [
] }
log = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }
tokio = { workspace = true, features = ["full"] }
2 changes: 1 addition & 1 deletion kiss/manager/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ log = { workspace = true }
octocrab = { workspace = true }
semver = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }
tokio = { workspace = true, features = ["full"] }
2 changes: 1 addition & 1 deletion kiss/monitor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ kube = { workspace = true, features = [
] }
log = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }
tokio = { workspace = true, features = ["full"] }
2 changes: 1 addition & 1 deletion proxyx/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repository = "https://github.com/ulagbulag/OpenARK"
proxyx-api = { path = "../api" }

anyhow = { workspace = true }
tokio = { workspace = true }
tokio = { workspace = true, features = ["full"] }

# TEST
dash-api = { path = "../../dash/api" }
Expand Down

0 comments on commit a789c21

Please sign in to comment.