Skip to content

Commit

Permalink
remove SpinAppExecutor from Helm chart
Browse files Browse the repository at this point in the history
Signed-off-by: Matthew Fisher <[email protected]>
  • Loading branch information
bacongobbler committed Feb 29, 2024
1 parent 5eef4c4 commit 6a27855
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 18 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ $(STAGING_DIR)/$(CHART_NAME)-$(CHART_VERSION).tgz: $(STAGING_DIR)/$(CHART_NAME)-
$(STAGING_DIR)/spin-operator.runtime-class.yaml:
cp spin-runtime-class.yaml $(STAGING_DIR)/spin-operator.runtime-class.yaml

$(STAGING_DIR)/spin-operator.shim-executor.yaml:
cp config/samples/shim-executor.yaml $(STAGING_DIR)/spin-operator.shim-executor.yaml

$(STAGING_DIR)/spin-operator.crds.yaml: manifests
for file in $$(ls $(CRD_DIR)) ; \
do \
Expand Down
10 changes: 9 additions & 1 deletion charts/spin-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,20 @@ Prior to installing the chart, you'll need to ensure the following:
$ kubectl apply -f https://github.com/spinkube/spin-operator/releases/download/v0.1.0-rc.1/spin-operator.crds.yaml
```

- An application executor is installed. This is the executor that spin-operator uses to run Spin applications.

<!-- TODO: templatize with release version corresponding to chart's appVersion -->

```console
$ kubectl apply -f https://github.com/spinkube/spin-operator/releases/download/v0.1.0-rc.1/spin-operator.shim-executor.yaml
```

- A RuntimeClass resource for the `wasmtime-spin-v2` container runtime is installed. This is the runtime that Spin applications use.

<!-- TODO: templatize with release version corresponding to chart's appVersion -->

```console
kubectl apply -f https://github.com/spinkube/spin-operator/releases/download/v0.1.0-rc.1/spin-operator.runtime-class.yaml
$ kubectl apply -f https://github.com/spinkube/spin-operator/releases/download/v0.1.0-rc.1/spin-operator.runtime-class.yaml
```

## Chart prerequisites
Expand Down
4 changes: 4 additions & 0 deletions charts/spin-operator/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ Kubernetes cluster before it can run the first Spin application.

$ kubectl apply -f https://github.com/spinkube/spin-operator/releases/download/{{ .Chart.AppVersion }}/spin-operator.crds.yaml

2. Install the containerd-shim-spin SpinAppExecutor:

$ kubectl apply -f https://github.com/spinkube/spin-operator/releases/download/{{ .Chart.AppVersion }}/spin-operator.executor.yaml

2. Install the wasmtime-spin-v2 RuntimeClass:

$ kubectl apply -f https://github.com/spinkube/spin-operator/releases/download/{{ .Chart.AppVersion }}/spin-operator.runtime-class.yaml
Expand Down
12 changes: 0 additions & 12 deletions charts/spin-operator/templates/containerd-shim-spin-executor.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions config/samples/shim-executor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ apiVersion: core.spinoperator.dev/v1
kind: SpinAppExecutor
metadata:
name: containerd-shim-spin
namespace: default
annotations:
"helm.sh/hook": post-install,post-upgrade
"helm.sh/hook-weight": "1"
spec:
createDeployment: true
deploymentConfig:
Expand Down
2 changes: 1 addition & 1 deletion spin-runtime-class.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: node.k8s.io/v1
kind: RuntimeClass
metadata:
name: wasmtime-spin-v2
handler: spin
handler: spin

0 comments on commit 6a27855

Please sign in to comment.