Skip to content

Commit

Permalink
Merge pull request #107 from kate-goldenring/spin-v2.4.3
Browse files Browse the repository at this point in the history
Use Spin v2.4.3 dependencies
  • Loading branch information
kate-goldenring authored May 8, 2024
2 parents f6029f2 + ff882bc commit eed8342
Show file tree
Hide file tree
Showing 11 changed files with 99 additions and 201 deletions.
254 changes: 76 additions & 178 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace.package]
version = "0.14.0"
version = "0.14.1"
edition = "2021"
license = "Apache-2.0"
readme = "README.md"
Expand Down
28 changes: 14 additions & 14 deletions containerd-shim-spin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "containerd-shim-spin-v2"
version = "0.14.0"
version = "0.14.1"
authors = ["SpinKube Engineering Team"]
edition = "2021"
repository = 'https://github.com/spinkube/containerd-shim-spin'
Expand All @@ -14,20 +14,20 @@ Containerd shim for running Spin workloads.
containerd-shim-wasm = "0.5.0"
containerd-shim = "0.7.1"
log = "0.4"
spin-app = { git = "https://github.com/fermyon/spin", tag = "v2.4.2" }
spin-core = { git = "https://github.com/fermyon/spin", tag = "v2.4.2" }
spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "191789170abde10cd55590466c0660dd6c7d472a" }
spin-app = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
spin-core = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
spin-componentize = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
# Enable loading components precompiled by the shim
spin-trigger = { git = "https://github.com/fermyon/spin", tag = "v2.4.2", features = ["unsafe-aot-compilation"] }
spin-trigger-http = { git = "https://github.com/fermyon/spin", tag = "v2.4.2" }
spin-trigger-redis = { git = "https://github.com/fermyon/spin", tag = "v2.4.2" }
trigger-sqs = { git = "https://github.com/fermyon/spin-trigger-sqs", rev = "dbfc599560ab54e759bfa586fe7315848f00a7f6" }
trigger-command = { git = "https://github.com/fermyon/spin-trigger-command" , rev = "af3cf1148573ab10e1e819b66cd920a04a789e50" }
spin-manifest = { git = "https://github.com/fermyon/spin", tag = "v2.4.2" }
spin-loader = { git = "https://github.com/fermyon/spin", tag = "v2.4.2" }
spin-oci = { git = "https://github.com/fermyon/spin", tag = "v2.4.2" }
spin-common = { git = "https://github.com/fermyon/spin", tag = "v2.4.2" }
spin-expressions = { git = "https://github.com/fermyon/spin", tag = "v2.4.2" }
spin-trigger = { git = "https://github.com/fermyon/spin", tag = "v2.4.3", features = ["unsafe-aot-compilation"] }
spin-trigger-http = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
spin-trigger-redis = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
trigger-sqs = { git = "https://github.com/fermyon/spin-trigger-sqs", rev = "ee1195ad76b78c41f9d8291e3470bcb0e8c01e66" }
trigger-command = { git = "https://github.com/fermyon/spin-trigger-command" , rev = "cc09ed61c5cd04de507b62a6f4912d8ae026bff6" }
spin-manifest = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
spin-loader = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
spin-oci = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
spin-common = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
spin-expressions = { git = "https://github.com/fermyon/spin", tag = "v2.4.3" }
wasmtime = "18.0.1"
tokio = { version = "1.37", features = ["rt"] }
openssl = { version = "*", features = ["vendored"] }
Expand Down
2 changes: 1 addition & 1 deletion containerd-shim-spin/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.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.14.1 -p "8081:80@loadbalancer" --agents 2 --registry-create mycluster-registry:12345
```

Apply RuntimeClass for spin applications to use the spin wasm shim:
Expand Down
2 changes: 1 addition & 1 deletion deployments/k3d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.0 -p "8081:80@loadbalancer" --agents 2
k3d cluster create wasm-cluster --image ghcr.io/spinkube/containerd-shim-spin/k3d:v0.14.1 -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"
Expand Down
2 changes: 1 addition & 1 deletion deployments/workloads/workload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
runtimeClassName: wasmtime-spin
containers:
- name: spin-hello
image: ghcr.io/spinkube/containerd-shim-spin/examples/spin-rust-hello:v0.14.0
image: ghcr.io/spinkube/containerd-shim-spin/examples/spin-rust-hello:v0.14.1
command: ["/"]
resources: # limit the resources to 128Mi of memory and 100m of CPU
limits:
Expand Down
2 changes: 1 addition & 1 deletion images/spin-dapr/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.0 -p "8081:80@loadbalancer"
k3d cluster create wasm-cluster --image ghcr.io/spinkube/containerd-shim-spin/k3d:v0.14.1 -p "8081:80@loadbalancer"
# Install Dapr
dapr init -k --wait
# or via helm
Expand Down
2 changes: 1 addition & 1 deletion images/spin-inbound-redis/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "spin-inbound-redis"
version = "0.14.0"
version = "0.14.1"
authors = ["Suneet Nangia <suneetnangia@gmail.com>"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion images/spin-keyvalue/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "spin-keyvalue"
version = "0.14.0"
version = "0.14.1"
authors = ["SpinKube Engineering Team"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion images/spin-outbound-redis/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "spin-outbound-redis"
version = "0.14.0"
version = "0.14.1"
authors = ["SpinKube Engineering Team"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion images/spin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "spin-rust-hello"
version = "0.14.0"
version = "0.14.1"
authors = ["SpinKube Engineering Team"]
edition = "2021"

Expand Down

0 comments on commit eed8342

Please sign in to comment.