From 1399b983f0282887a22b9378dea0ad72a38538fd Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Mon, 30 Oct 2023 19:13:42 +0000 Subject: [PATCH] chore: bump version to 0.9.2 Signed-off-by: jiaxiao zhou --- Cargo.toml | 2 +- containerd-shim-lunatic-v1/Cargo.lock | 2 +- containerd-shim-lunatic-v1/Cargo.toml | 2 +- containerd-shim-lunatic-v1/build.rs | 24 ------------------------ containerd-shim-slight-v1/Cargo.lock | 6 +++--- containerd-shim-slight-v1/Cargo.toml | 2 +- containerd-shim-slight-v1/build.rs | 24 ------------------------ containerd-shim-spin-v1/Cargo.lock | 2 +- containerd-shim-spin-v1/Cargo.toml | 2 +- containerd-shim-spin-v1/build.rs | 24 ------------------------ containerd-shim-wws-v1/Cargo.lock | 2 +- containerd-shim-wws-v1/Cargo.toml | 2 +- containerd-shim-wws-v1/build.rs | 24 ------------------------ deployments/k3d/README.md | 2 +- deployments/workloads/workload.yaml | 8 ++++---- images/slight/Cargo.toml | 2 +- images/spin-outbound-redis/Cargo.toml | 2 +- images/spin/Cargo.toml | 2 +- 18 files changed, 19 insertions(+), 115 deletions(-) delete mode 100644 containerd-shim-lunatic-v1/build.rs delete mode 100644 containerd-shim-slight-v1/build.rs delete mode 100644 containerd-shim-spin-v1/build.rs delete mode 100644 containerd-shim-wws-v1/build.rs diff --git a/Cargo.toml b/Cargo.toml index 1bb4f574..98bb0dc0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.9.1" +version = "0.9.2" edition = "2021" license = "Apache-2.0" readme = "README.md" diff --git a/containerd-shim-lunatic-v1/Cargo.lock b/containerd-shim-lunatic-v1/Cargo.lock index 0e1ad52e..795d95c8 100644 --- a/containerd-shim-lunatic-v1/Cargo.lock +++ b/containerd-shim-lunatic-v1/Cargo.lock @@ -584,7 +584,7 @@ dependencies = [ [[package]] name = "containerd-shim-lunatic-v1" -version = "0.1.0" +version = "0.9.2" dependencies = [ "anyhow", "chrono", diff --git a/containerd-shim-lunatic-v1/Cargo.toml b/containerd-shim-lunatic-v1/Cargo.toml index 60a25523..a98f13cd 100644 --- a/containerd-shim-lunatic-v1/Cargo.toml +++ b/containerd-shim-lunatic-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-lunatic-v1" -version = "0.1.0" +version = "0.9.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/containerd-shim-lunatic-v1/build.rs b/containerd-shim-lunatic-v1/build.rs deleted file mode 100644 index e5e6ae0b..00000000 --- a/containerd-shim-lunatic-v1/build.rs +++ /dev/null @@ -1,24 +0,0 @@ -use std::process::Command; -use std::str::from_utf8; - -fn main() { - let output = match Command::new("git").arg("rev-parse").arg("HEAD").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - let mut hash = from_utf8(&output.stdout).unwrap().trim().to_string(); - - let output_dirty = match Command::new("git").arg("diff").arg("--exit-code").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - - if !output_dirty.status.success() { - hash.push_str(".m"); - } - println!("cargo:rustc-env=CARGO_GIT_HASH={}", hash); -} diff --git a/containerd-shim-slight-v1/Cargo.lock b/containerd-shim-slight-v1/Cargo.lock index dc05b2c6..58cf5db0 100644 --- a/containerd-shim-slight-v1/Cargo.lock +++ b/containerd-shim-slight-v1/Cargo.lock @@ -1460,7 +1460,7 @@ dependencies = [ [[package]] name = "containerd-shim-slight-v1" -version = "0.9.1" +version = "0.9.2" dependencies = [ "anyhow", "containerd-shim-wasm", @@ -3825,9 +3825,9 @@ dependencies = [ [[package]] name = "postgres" -version = "0.19.7" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" +checksum = "2843af30d9b6dccec9f8779eb50d56cfbec54b38c7b1bbaf50b37d6c8a4f8959" dependencies = [ "bytes 1.5.0", "fallible-iterator", diff --git a/containerd-shim-slight-v1/Cargo.toml b/containerd-shim-slight-v1/Cargo.toml index ece3889e..3e13549a 100644 --- a/containerd-shim-slight-v1/Cargo.toml +++ b/containerd-shim-slight-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-slight-v1" -version = "0.9.1" +version = "0.9.2" authors = ["DeisLabs Engineering Team"] edition = "2021" repository = 'https://github.com/deislabs/containerd-wasm-shims' diff --git a/containerd-shim-slight-v1/build.rs b/containerd-shim-slight-v1/build.rs deleted file mode 100644 index e5e6ae0b..00000000 --- a/containerd-shim-slight-v1/build.rs +++ /dev/null @@ -1,24 +0,0 @@ -use std::process::Command; -use std::str::from_utf8; - -fn main() { - let output = match Command::new("git").arg("rev-parse").arg("HEAD").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - let mut hash = from_utf8(&output.stdout).unwrap().trim().to_string(); - - let output_dirty = match Command::new("git").arg("diff").arg("--exit-code").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - - if !output_dirty.status.success() { - hash.push_str(".m"); - } - println!("cargo:rustc-env=CARGO_GIT_HASH={}", hash); -} diff --git a/containerd-shim-spin-v1/Cargo.lock b/containerd-shim-spin-v1/Cargo.lock index 52da63aa..7eba8926 100644 --- a/containerd-shim-spin-v1/Cargo.lock +++ b/containerd-shim-spin-v1/Cargo.lock @@ -1084,7 +1084,7 @@ dependencies = [ [[package]] name = "containerd-shim-spin-v1" -version = "0.9.1" +version = "0.9.2" dependencies = [ "anyhow", "containerd-shim-wasm", diff --git a/containerd-shim-spin-v1/Cargo.toml b/containerd-shim-spin-v1/Cargo.toml index 4e746fab..8a1e9306 100644 --- a/containerd-shim-spin-v1/Cargo.toml +++ b/containerd-shim-spin-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-spin-v1" -version = "0.9.1" +version = "0.9.2" authors = ["DeisLabs Engineering Team"] edition = "2021" repository = 'https://github.com/deislabs/containerd-wasm-shims' diff --git a/containerd-shim-spin-v1/build.rs b/containerd-shim-spin-v1/build.rs deleted file mode 100644 index e5e6ae0b..00000000 --- a/containerd-shim-spin-v1/build.rs +++ /dev/null @@ -1,24 +0,0 @@ -use std::process::Command; -use std::str::from_utf8; - -fn main() { - let output = match Command::new("git").arg("rev-parse").arg("HEAD").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - let mut hash = from_utf8(&output.stdout).unwrap().trim().to_string(); - - let output_dirty = match Command::new("git").arg("diff").arg("--exit-code").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - - if !output_dirty.status.success() { - hash.push_str(".m"); - } - println!("cargo:rustc-env=CARGO_GIT_HASH={}", hash); -} diff --git a/containerd-shim-wws-v1/Cargo.lock b/containerd-shim-wws-v1/Cargo.lock index ac87dabd..b1abbaed 100644 --- a/containerd-shim-wws-v1/Cargo.lock +++ b/containerd-shim-wws-v1/Cargo.lock @@ -848,7 +848,7 @@ dependencies = [ [[package]] name = "containerd-shim-wws-v1" -version = "0.9.1" +version = "0.9.2" dependencies = [ "anyhow", "containerd-shim-wasm", diff --git a/containerd-shim-wws-v1/Cargo.toml b/containerd-shim-wws-v1/Cargo.toml index b92a9bb8..d8caa693 100644 --- a/containerd-shim-wws-v1/Cargo.toml +++ b/containerd-shim-wws-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-wws-v1" -version = "0.9.1" +version = "0.9.2" authors = ["Wasm Labs team "] edition = "2021" repository = 'https://github.com/deislabs/containerd-wasm-shims' diff --git a/containerd-shim-wws-v1/build.rs b/containerd-shim-wws-v1/build.rs deleted file mode 100644 index e5e6ae0b..00000000 --- a/containerd-shim-wws-v1/build.rs +++ /dev/null @@ -1,24 +0,0 @@ -use std::process::Command; -use std::str::from_utf8; - -fn main() { - let output = match Command::new("git").arg("rev-parse").arg("HEAD").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - let mut hash = from_utf8(&output.stdout).unwrap().trim().to_string(); - - let output_dirty = match Command::new("git").arg("diff").arg("--exit-code").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - - if !output_dirty.status.success() { - hash.push_str(".m"); - } - println!("cargo:rustc-env=CARGO_GIT_HASH={}", hash); -} diff --git a/deployments/k3d/README.md b/deployments/k3d/README.md index 14856665..fdd6c96c 100644 --- a/deployments/k3d/README.md +++ b/deployments/k3d/README.md @@ -17,7 +17,7 @@ $ tree . ## How to run the example The shell script below will create a k3d cluster locally with the Wasm shims installed and containerd configured. The script then applies the runtime classes for the shims and an example service and deployment. Finally, we curl the `/hello` and receive a response from the example workload. ```shell -k3d cluster create wasm-cluster --image ghcr.io/deislabs/containerd-wasm-shims/examples/k3d:v0.9.1 -p "8081:80@loadbalancer" --agents 2 +k3d cluster create wasm-cluster --image ghcr.io/deislabs/containerd-wasm-shims/examples/k3d:v0.9.2 -p "8081:80@loadbalancer" --agents 2 kubectl apply -f https://github.com/deislabs/containerd-wasm-shims/raw/main/deployments/workloads/runtime.yaml kubectl apply -f https://github.com/deislabs/containerd-wasm-shims/raw/main/deployments/workloads/workload.yaml echo "waiting 5 seconds for workload to be ready" diff --git a/deployments/workloads/workload.yaml b/deployments/workloads/workload.yaml index 1ebb0284..a6fa103f 100644 --- a/deployments/workloads/workload.yaml +++ b/deployments/workloads/workload.yaml @@ -15,7 +15,7 @@ spec: runtimeClassName: wasmtime-slight containers: - name: slight-hello - image: ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:v0.9.1 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:v0.9.2 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: @@ -54,7 +54,7 @@ spec: runtimeClassName: wasmtime-spin containers: - name: spin-hello - image: ghcr.io/deislabs/containerd-wasm-shims/examples/spin-rust-hello:v0.9.1 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/spin-rust-hello:v0.9.2 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: @@ -93,7 +93,7 @@ spec: runtimeClassName: wasmtime-wws containers: - name: wws-hello - image: ghcr.io/deislabs/containerd-wasm-shims/examples/wws-js-hello:v0.9.1 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/wws-js-hello:v0.9.2 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: @@ -132,7 +132,7 @@ spec: runtimeClassName: wasmtime-lunatic containers: - name: lunatic - image: ghcr.io/deislabs/containerd-wasm-shims/examples/lunatic-submillisecond:v0.9.1 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/lunatic-submillisecond:v0.9.2 resources: # limit the resources to 128Mi of memory and 100m of CPU limits: cpu: 100m diff --git a/images/slight/Cargo.toml b/images/slight/Cargo.toml index 712c523d..e4dd324a 100644 --- a/images/slight/Cargo.toml +++ b/images/slight/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "http-server-lib" -version = "0.9.1" +version = "0.9.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/images/spin-outbound-redis/Cargo.toml b/images/spin-outbound-redis/Cargo.toml index 9cca9227..09515243 100644 --- a/images/spin-outbound-redis/Cargo.toml +++ b/images/spin-outbound-redis/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-outbound-redis" -version = "0.9.1" +version = "0.9.2" authors = ["DeisLabs Engineering Team"] edition = "2021" diff --git a/images/spin/Cargo.toml b/images/spin/Cargo.toml index 5759d7a9..7a81ae78 100644 --- a/images/spin/Cargo.toml +++ b/images/spin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-rust-hello" -version = "0.9.1" +version = "0.9.2" authors = ["DeisLabs Engineering Team"] edition = "2021"