From a92cb19a75152544f2661dba9c4b0e8d87bcf36e Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Fri, 8 Nov 2024 22:17:31 +0000 Subject: [PATCH 1/4] all: bump version from v0.16.0 to v0.17.0 Signed-off-by: jiaxiao zhou --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- README.md | 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-keyvalue/Cargo.lock | 2 +- images/spin-keyvalue/Cargo.toml | 2 +- images/spin-multi-trigger-app/spin-http-trigger/Cargo.lock | 2 +- images/spin-multi-trigger-app/spin-http-trigger/Cargo.toml | 2 +- images/spin-multi-trigger-app/spin-redis-trigger/Cargo.lock | 2 +- images/spin-multi-trigger-app/spin-redis-trigger/Cargo.toml | 2 +- images/spin-outbound-redis/Cargo.lock | 2 +- images/spin-outbound-redis/Cargo.toml | 2 +- images/spin/Cargo.lock | 2 +- images/spin/Cargo.toml | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 930f0e5c..b26ab5df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1564,7 +1564,7 @@ dependencies = [ [[package]] name = "containerd-shim-spin-tests" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "curl", @@ -1581,7 +1581,7 @@ dependencies = [ [[package]] name = "containerd-shim-spin-v2" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "containerd-shim", @@ -6695,7 +6695,7 @@ dependencies = [ [[package]] name = "shim-conformance-tests" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "conformance-tests", diff --git a/Cargo.toml b/Cargo.toml index 3641982d..0b81467d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.16.0" +version = "0.17.0" edition = "2021" license = "Apache-2.0" readme = "README.md" diff --git a/README.md b/README.md index 26e1451e..888bd9ae 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This project aims to provide the [containerd shim](https://github.com/containerd Below is a table for referencing the version of the Spin runtime used in each `containerd-shim-spin` release. -| **shim version** | v0.12.0 | v0.13.0 | v0.14.0 | v0.14.1 | v0.15.0 | v0.15.1 | v0.16.0 | +| **shim version** | v0.12.0 | v0.13.0 | v0.14.0 | v0.14.1 | v0.15.0 | v0.15.1 | v0.17.0 | | ---------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | --- | | **spin** | [v2.2.0](https://github.com/fermyon/spin/releases/tag/v2.2.0) | [v2.3.1](https://github.com/fermyon/spin/releases/tag/v2.3.1) | [v2.4.2](https://github.com/fermyon/spin/releases/tag/v2.4.2) | [v2.4.3](https://github.com/fermyon/spin/releases/tag/v2.4.3) | [v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) | [v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) | [v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) | diff --git a/containerd-shim-spin/quickstart.md b/containerd-shim-spin/quickstart.md index b0073c30..dfb7b2ea 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.16.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.17.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 4f39dad5..dad93c5b 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.16.0 -p "8081:80@loadbalancer" --agents 2 +k3d cluster create wasm-cluster --image ghcr.io/spinkube/containerd-shim-spin/k3d:v0.17.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 3e9c23b1..5855408e 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.16.0 + image: ghcr.io/spinkube/containerd-shim-spin/examples/spin-rust-hello:v0.17.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 e15afd40..ab983ad2 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.16.0 -p "8081:80@loadbalancer" +k3d cluster create wasm-cluster --image ghcr.io/spinkube/containerd-shim-spin/k3d:v0.17.0 -p "8081:80@loadbalancer" # Install Dapr dapr init -k --wait # or via helm diff --git a/images/spin-keyvalue/Cargo.lock b/images/spin-keyvalue/Cargo.lock index 5a4b06b2..186a331c 100644 --- a/images/spin-keyvalue/Cargo.lock +++ b/images/spin-keyvalue/Cargo.lock @@ -355,7 +355,7 @@ dependencies = [ [[package]] name = "spin-keyvalue" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "http", diff --git a/images/spin-keyvalue/Cargo.toml b/images/spin-keyvalue/Cargo.toml index 354213c8..a6a855bb 100644 --- a/images/spin-keyvalue/Cargo.toml +++ b/images/spin-keyvalue/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-keyvalue" -version = "0.16.0" +version = "0.17.0" authors = ["SpinKube Engineering Team"] edition = "2021" diff --git a/images/spin-multi-trigger-app/spin-http-trigger/Cargo.lock b/images/spin-multi-trigger-app/spin-http-trigger/Cargo.lock index c6ca6e97..96690262 100644 --- a/images/spin-multi-trigger-app/spin-http-trigger/Cargo.lock +++ b/images/spin-multi-trigger-app/spin-http-trigger/Cargo.lock @@ -355,7 +355,7 @@ dependencies = [ [[package]] name = "spin-http-trigger" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "spin-sdk", diff --git a/images/spin-multi-trigger-app/spin-http-trigger/Cargo.toml b/images/spin-multi-trigger-app/spin-http-trigger/Cargo.toml index 1e8eb1f6..f85f9829 100644 --- a/images/spin-multi-trigger-app/spin-http-trigger/Cargo.toml +++ b/images/spin-multi-trigger-app/spin-http-trigger/Cargo.toml @@ -2,7 +2,7 @@ name = "spin-http-trigger" authors = ["Rajat Jindal "] description = "" -version = "0.16.0" +version = "0.17.0" edition = "2021" [lib] diff --git a/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.lock b/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.lock index cb998a5c..1e7caa11 100644 --- a/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.lock +++ b/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.lock @@ -369,7 +369,7 @@ dependencies = [ [[package]] name = "spin-redis-trigger" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "bytes", diff --git a/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.toml b/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.toml index 2a9988e0..def62e32 100644 --- a/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.toml +++ b/images/spin-multi-trigger-app/spin-redis-trigger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-redis-trigger" -version = "0.16.0" +version = "0.17.0" authors = ["Suneet Nangia "] edition = "2021" diff --git a/images/spin-outbound-redis/Cargo.lock b/images/spin-outbound-redis/Cargo.lock index 284dca58..8b196b24 100644 --- a/images/spin-outbound-redis/Cargo.lock +++ b/images/spin-outbound-redis/Cargo.lock @@ -368,7 +368,7 @@ dependencies = [ [[package]] name = "spin-outbound-redis" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "bytes", diff --git a/images/spin-outbound-redis/Cargo.toml b/images/spin-outbound-redis/Cargo.toml index dbf3bece..f1203c85 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.16.0" +version = "0.17.0" authors = ["SpinKube Engineering Team"] edition = "2021" diff --git a/images/spin/Cargo.lock b/images/spin/Cargo.lock index 907a7b30..aac86aff 100644 --- a/images/spin/Cargo.lock +++ b/images/spin/Cargo.lock @@ -368,7 +368,7 @@ dependencies = [ [[package]] name = "spin-rust-hello" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "http", diff --git a/images/spin/Cargo.toml b/images/spin/Cargo.toml index 72f7eecd..50819685 100644 --- a/images/spin/Cargo.toml +++ b/images/spin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-rust-hello" -version = "0.16.0" +version = "0.17.0" authors = ["SpinKube Engineering Team"] edition = "2021" From e1b577be2a3b122b1d19beb62bfa37c0cc65d2e1 Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Fri, 8 Nov 2024 22:19:51 +0000 Subject: [PATCH 2/4] CHANGELOG: update v0.17.0 Signed-off-by: jiaxiao zhou --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41611ee4..f763c485 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [v0.17.0](https://github.com/spinkube/containerd-shim-spin/releases/tag/v0.17.0) - 2024-11-08 ### Added @@ -45,5 +45,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), --- -[Unreleased]: +[Unreleased]: +[v0.17.0]: https://github.com/spinkube/containerd-shim-spin/compare/v0.16.0...v0.17.0 [v0.16.0]: https://github.com/spinkube/containerd-shim-spin/compare/v0.15.1...v0.16.0 From a1fe0047b39d52ee7679e3e10915f1d38541c9c7 Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Fri, 8 Nov 2024 22:21:42 +0000 Subject: [PATCH 3/4] README: add a entry to map v0.17.0 to spin v3 in the shim and spin version map Signed-off-by: jiaxiao zhou --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 888bd9ae..847c8e15 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ This project aims to provide the [containerd shim](https://github.com/containerd Below is a table for referencing the version of the Spin runtime used in each `containerd-shim-spin` release. -| **shim version** | v0.12.0 | v0.13.0 | v0.14.0 | v0.14.1 | v0.15.0 | v0.15.1 | v0.17.0 | -| ---------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | --- | -| **spin** | [v2.2.0](https://github.com/fermyon/spin/releases/tag/v2.2.0) | [v2.3.1](https://github.com/fermyon/spin/releases/tag/v2.3.1) | [v2.4.2](https://github.com/fermyon/spin/releases/tag/v2.4.2) | [v2.4.3](https://github.com/fermyon/spin/releases/tag/v2.4.3) | [v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) | [v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) | [v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) | +| **shim version** | v0.12.0 | v0.13.0 | v0.14.0 | v0.14.1 | v0.15.0 | v0.15.1 | v0.16.0 | v0.17.0 | +| ---------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- | --- | --- | +| **spin** | [v2.2.0](https://github.com/fermyon/spin/releases/tag/v2.2.0) | [v2.3.1](https://github.com/fermyon/spin/releases/tag/v2.3.1) | [v2.4.2](https://github.com/fermyon/spin/releases/tag/v2.4.2) | [v2.4.3](https://github.com/fermyon/spin/releases/tag/v2.4.3) | [v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) | [v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) | [v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) | [v3.0.0](https://github.com/fermyon/spin/releases/tag/v3.0.0) | ## Documentation From 9a67568f9bb03173be0eb1b3b75c8836c261a33b Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Fri, 8 Nov 2024 23:05:25 +0000 Subject: [PATCH 4/4] CHANGELOG: Remove Fixed #216: Spin state dir not being created The issue doesn't impact users, so omitting it from the changelog. Signed-off-by: jiaxiao zhou --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f763c485..e1f2b5d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), ### Fixed -- Fixed [#216](https://github.com/spinkube/containerd-shim-spin/issues/216): Spin state dir not being created - FIxed CI errors due to old versions of Go and TinyGo and disk pressure ([#217](https://github.com/spinkube/containerd-shim-spin/pull/217))