From 34b65c7a2006d820e4b81531ad6a896084dcda30 Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Mon, 11 Mar 2024 18:16:48 +0000 Subject: [PATCH 1/2] chore(*): bump version to v0.12.0 Signed-off-by: jiaxiao zhou --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- containerd-shim-spin/Cargo.toml | 2 +- containerd-shim-spin/quickstart.md | 2 +- deployments/k3d/README.md | 2 +- deployments/workloads/workload.yaml | 2 +- images/spin-dapr/README.md | 2 +- images/spin-inbound-redis/Cargo.toml | 2 +- images/spin-keyvalue/Cargo.toml | 2 +- images/spin-outbound-redis/Cargo.toml | 2 +- images/spin/Cargo.toml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6632270..1605c8b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1296,7 +1296,7 @@ dependencies = [ [[package]] name = "containerd-shim-spin-tests" -version = "0.10.0" +version = "0.12.0" dependencies = [ "anyhow", "curl", @@ -1312,7 +1312,7 @@ dependencies = [ [[package]] name = "containerd-shim-spin-v2" -version = "0.10.0" +version = "0.12.0" dependencies = [ "anyhow", "containerd-shim", diff --git a/Cargo.toml b/Cargo.toml index befc2a31..fa0a3843 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.10.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" readme = "README.md" diff --git a/containerd-shim-spin/Cargo.toml b/containerd-shim-spin/Cargo.toml index bb077e23..68168eb7 100644 --- a/containerd-shim-spin/Cargo.toml +++ b/containerd-shim-spin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-spin-v2" -version = "0.10.0" +version = "0.12.0" authors = ["DeisLabs Engineering Team"] edition = "2021" repository = 'https://github.com/spinkube/containerd-shim-spin' diff --git a/containerd-shim-spin/quickstart.md b/containerd-shim-spin/quickstart.md index 3d4647ba..f819857a 100644 --- a/containerd-shim-spin/quickstart.md +++ b/containerd-shim-spin/quickstart.md @@ -14,7 +14,7 @@ Before you begin, you need to have the following installed: Start a k3d cluster with the wasm shims already installed: ```bash -k3d cluster create wasm-cluster --image ghcr.io/spinkube/containerd-shim-spin/k3d:v0.10.0 -p "8081:80@loadbalancer" --agents 2 --registry-create mycluster-registry:12345 +k3d cluster create wasm-cluster --image ghcr.io/spinkube/containerd-shim-spin/k3d:v0.12.0 -p "8081:80@loadbalancer" --agents 2 --registry-create mycluster-registry:12345 ``` Apply RuntimeClass for spin applications to use the spin wasm shim: diff --git a/deployments/k3d/README.md b/deployments/k3d/README.md index 3375935c..056c6246 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 Spin shim installed and containerd configured. The script then applies the runtime classes for the shim 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/spinkube/containerd-shim-spin/k3d:v0.10.0 -p "8081:80@loadbalancer" --agents 2 +k3d cluster create wasm-cluster --image ghcr.io/spinkube/containerd-shim-spin/k3d:v0.12.0 -p "8081:80@loadbalancer" --agents 2 kubectl apply -f https://github.com/spinkube/containerd-shim-spin/raw/main/deployments/workloads/runtime.yaml kubectl apply -f https://github.com/spinkube/containerd-shim-spin/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 5c9e3af0..11a3db28 100644 --- a/deployments/workloads/workload.yaml +++ b/deployments/workloads/workload.yaml @@ -15,7 +15,7 @@ spec: runtimeClassName: wasmtime-spin containers: - name: spin-hello - image: ghcr.io/spinkube/containerd-shim-spin/examples/spin-rust-hello:v0.10.0 + image: ghcr.io/spinkube/containerd-shim-spin/examples/spin-rust-hello:v0.12.0 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: diff --git a/images/spin-dapr/README.md b/images/spin-dapr/README.md index f44b20b8..69504eb1 100644 --- a/images/spin-dapr/README.md +++ b/images/spin-dapr/README.md @@ -18,7 +18,7 @@ sudo mv ./spin /usr/local/bin/ ### Run example with K3d: ```sh # start the K3d cluster -k3d cluster create wasm-cluster --image ghcr.io/spinkube/containerd-shim-spin/k3d:v0.10.0 -p "8081:80@loadbalancer" +k3d cluster create wasm-cluster --image ghcr.io/spinkube/containerd-shim-spin/k3d:v0.12.0 -p "8081:80@loadbalancer" # Install Dapr dapr init -k --wait # or via helm diff --git a/images/spin-inbound-redis/Cargo.toml b/images/spin-inbound-redis/Cargo.toml index efbcd945..7bd5a7e9 100644 --- a/images/spin-inbound-redis/Cargo.toml +++ b/images/spin-inbound-redis/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-inbound-redis" -version = "0.10.0" +version = "0.12.0" authors = ["Suneet Nangia "] edition = "2021" diff --git a/images/spin-keyvalue/Cargo.toml b/images/spin-keyvalue/Cargo.toml index c20414fc..2956a0ba 100644 --- a/images/spin-keyvalue/Cargo.toml +++ b/images/spin-keyvalue/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-keyvalue" -version = "0.9.3" +version = "0.12.0" authors = ["DeisLabs Engineering Team"] edition = "2021" diff --git a/images/spin-outbound-redis/Cargo.toml b/images/spin-outbound-redis/Cargo.toml index 064b189d..d266ae24 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.10.0" +version = "0.12.0" authors = ["DeisLabs Engineering Team"] edition = "2021" diff --git a/images/spin/Cargo.toml b/images/spin/Cargo.toml index 95973a09..b034acd8 100644 --- a/images/spin/Cargo.toml +++ b/images/spin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-rust-hello" -version = "0.10.0" +version = "0.12.0" authors = ["DeisLabs Engineering Team"] edition = "2021" From 50a7b08709d80699a74973fc0661f81d4273525f Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Mon, 11 Mar 2024 18:21:25 +0000 Subject: [PATCH 2/2] fix(*): deislabs -> spinkube Signed-off-by: jiaxiao zhou --- containerd-shim-spin/Cargo.toml | 2 +- images/spin-keyvalue/Cargo.toml | 2 +- images/spin-keyvalue/spin.toml | 2 +- images/spin-outbound-redis/Cargo.toml | 2 +- images/spin-outbound-redis/spin.toml | 2 +- images/spin/Cargo.toml | 2 +- images/spin/spin.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/containerd-shim-spin/Cargo.toml b/containerd-shim-spin/Cargo.toml index 68168eb7..d502311d 100644 --- a/containerd-shim-spin/Cargo.toml +++ b/containerd-shim-spin/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "containerd-shim-spin-v2" version = "0.12.0" -authors = ["DeisLabs Engineering Team"] +authors = ["SpinKube Engineering Team"] edition = "2021" repository = 'https://github.com/spinkube/containerd-shim-spin' license = "Apache-2.0" diff --git a/images/spin-keyvalue/Cargo.toml b/images/spin-keyvalue/Cargo.toml index 2956a0ba..5f7e96ad 100644 --- a/images/spin-keyvalue/Cargo.toml +++ b/images/spin-keyvalue/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "spin-keyvalue" version = "0.12.0" -authors = ["DeisLabs Engineering Team"] +authors = ["SpinKube Engineering Team"] edition = "2021" [lib] diff --git a/images/spin-keyvalue/spin.toml b/images/spin-keyvalue/spin.toml index 5be42dee..f9605fd5 100644 --- a/images/spin-keyvalue/spin.toml +++ b/images/spin-keyvalue/spin.toml @@ -2,7 +2,7 @@ spin_manifest_version = 2 [application] name = "spin-hello" -authors = ["Kate Goldenring ", "DeisLabs Engineering Team"] +authors = ["Kate Goldenring ", "SpinKube Engineering Team"] description = "hello" version = "0.1.0" diff --git a/images/spin-outbound-redis/Cargo.toml b/images/spin-outbound-redis/Cargo.toml index d266ae24..e96581a9 100644 --- a/images/spin-outbound-redis/Cargo.toml +++ b/images/spin-outbound-redis/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "spin-outbound-redis" version = "0.12.0" -authors = ["DeisLabs Engineering Team"] +authors = ["SpinKube Engineering Team"] edition = "2021" [lib] diff --git a/images/spin-outbound-redis/spin.toml b/images/spin-outbound-redis/spin.toml index 32277ef8..c9873e4d 100644 --- a/images/spin-outbound-redis/spin.toml +++ b/images/spin-outbound-redis/spin.toml @@ -1,7 +1,7 @@ spin_manifest_version = 2 [application] -authors = ["DeisLabs Engineering Team"] +authors = ["SpinKube Engineering Team"] name = "spin-outbound-redis" version = "1.0.0" diff --git a/images/spin/Cargo.toml b/images/spin/Cargo.toml index b034acd8..68b83040 100644 --- a/images/spin/Cargo.toml +++ b/images/spin/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "spin-rust-hello" version = "0.12.0" -authors = ["DeisLabs Engineering Team"] +authors = ["SpinKube Engineering Team"] edition = "2021" [lib] diff --git a/images/spin/spin.toml b/images/spin/spin.toml index 17ffeaa0..dbc8c7bf 100644 --- a/images/spin/spin.toml +++ b/images/spin/spin.toml @@ -1,7 +1,7 @@ spin_manifest_version = 2 [application] -authors = ["DeisLabs Engineering Team"] +authors = ["SpinKube Engineering Team"] description = "A simple spin hello world" name = "spin-hello" version = "1.0.0"