Skip to content

Commit c040cf1

Browse files
committed
ref(shims): remove support for deprecated shims
Signed-off-by: Vaughn Dice <[email protected]>
1 parent ac6d118 commit c040cf1

File tree

10 files changed

+15
-101
lines changed

10 files changed

+15
-101
lines changed

config/samples/kustomization.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
## Append samples of your project ##
22
resources:
3-
- test_shim_lunatic.yaml
4-
- test_shim_slight.yaml
53
- test_shim_spin.yaml
6-
- test_shim_wws.yaml
74
- sample_shim_spin.yaml
85
- sample_shim_wasmtime.yaml
96
#+kubebuilder:scaffold:manifestskustomizesamples

config/samples/test_shim_lunatic.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

config/samples/test_shim_slight.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

config/samples/test_shim_spin.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# This shim was originally used for test automation, but was also referenced by the v0.1.0 Helm chart
2+
# It should be removed (deferring to 'sample_shim_spin.yaml') by 1.0.0 at the latest
13
apiVersion: runtime.spinkube.dev/v1alpha1
24
kind: Shim
35
metadata:

config/samples/test_shim_wws.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

docs/supported_distros.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
# Supported-Matrix
22

3-
We support the same Kubernetes distributions as Kwasm.
3+
We support the following Kubernetes distributions.
44

5-
| Container runtimes | Kind | Azure Kubernetes | GCP Kubernetes | AWS Kubernetes | Digital Ocean Kubernetes | CIVO Kubernetes | Kubernetes in Docker | Minikube | Canonical MicroK8s |
6-
|---------------------|------|------------------|----------------|----------------|--------------------------|-----------------|----------------------|----------|--------------------|
7-
| WasmEdge ||| (✅) | (✅) ||||||
8-
| Wasmtime ||| (✅) | (✅) ||||||
9-
| Spin ||| (✅) | (✅) ||||||
10-
| Wasm Workers Server ||| (✅) | (✅) ||||||
11-
| Lunatic ||| (✅) | (✅) ||||||
12-
| Slight ||| (✅) | (✅) ||||||
5+
| Container runtimes | Kind | Azure Kubernetes | GCP Kubernetes | AWS Kubernetes | Digital Ocean Kubernetes | CIVO Kubernetes | Kubernetes in Docker | Minikube | Canonical MicroK8s | RKE2 | K3s | KOs |
6+
|---------------------|------|------------------|----------------|----------------|--------------------------|-----------------|----------------------|----------|--------------------|------|-----|-----|
7+
| WasmEdge ||| (✅) | (✅) |||||||||
8+
| Wasmtime ||| (✅) | (✅) |||||||||
9+
| Spin ||| (✅) | (✅) |||||||||
1310

1411
✅ = officially supported
1512
(✅) = only with Ubuntu Nodes

hack/kind.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,4 @@ nodes:
77
spin: true
88
- role: worker
99
labels:
10-
wws: true
1110
spin: true
12-
- role: worker
13-
labels:
14-
slight: true
15-
- role: worker
16-
labels:
17-
lunatic: true

internal/shim/install_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ func TestConfig_Install(t *testing.T) {
5454
"/assets",
5555
"/opt/rcm",
5656
},
57-
args{"containerd-shim-slight-v1"},
57+
args{"containerd-shim-wasmtime-v1"},
5858
wants{
59-
"/opt/rcm/bin/containerd-shim-slight-v1",
59+
"/opt/rcm/bin/containerd-shim-wasmtime-v1",
6060
true,
6161
},
6262
false,
@@ -84,9 +84,9 @@ func TestConfig_Install(t *testing.T) {
8484
"/assets",
8585
"/opt/rcm",
8686
},
87-
args{"containerd-shim-slight-v1"},
87+
args{"containerd-shim-wasmtime-v1"},
8888
wants{
89-
"/opt/rcm/bin/containerd-shim-slight-v1",
89+
"/opt/rcm/bin/containerd-shim-wasmtime-v1",
9090
true,
9191
},
9292
false,

testdata/node-installer/assets/containerd-shim-slight-v1

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
echo "hello from wasmtime-v1"

0 commit comments

Comments
 (0)