From 6a27855ab8d52ebbc649af6aba60c46a98b4c166 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matt.fisher@fermyon.com>
Date: Thu, 29 Feb 2024 08:37:18 -0800
Subject: [PATCH] remove SpinAppExecutor from Helm chart

Signed-off-by: Matthew Fisher <matt.fisher@fermyon.com>
---
 Makefile                                             |  3 +++
 charts/spin-operator/README.md                       | 10 +++++++++-
 charts/spin-operator/templates/NOTES.txt             |  4 ++++
 .../templates/containerd-shim-spin-executor.yaml     | 12 ------------
 config/samples/shim-executor.yaml                    |  4 ----
 spin-runtime-class.yaml                              |  2 +-
 6 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 100644 charts/spin-operator/templates/containerd-shim-spin-executor.yaml

diff --git a/Makefile b/Makefile
index bb87a311..df0f5eb0 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
diff --git a/charts/spin-operator/README.md b/charts/spin-operator/README.md
index 265a5dfd..53bb3a99 100644
--- a/charts/spin-operator/README.md
+++ b/charts/spin-operator/README.md
@@ -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
diff --git a/charts/spin-operator/templates/NOTES.txt b/charts/spin-operator/templates/NOTES.txt
index eed1d939..3fd8a0ee 100644
--- a/charts/spin-operator/templates/NOTES.txt
+++ b/charts/spin-operator/templates/NOTES.txt
@@ -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
diff --git a/charts/spin-operator/templates/containerd-shim-spin-executor.yaml b/charts/spin-operator/templates/containerd-shim-spin-executor.yaml
deleted file mode 100644
index c615b3ac..00000000
--- a/charts/spin-operator/templates/containerd-shim-spin-executor.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-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:
-    runtimeClassName: wasmtime-spin-v2
diff --git a/config/samples/shim-executor.yaml b/config/samples/shim-executor.yaml
index c615b3ac..531f4dcd 100644
--- a/config/samples/shim-executor.yaml
+++ b/config/samples/shim-executor.yaml
@@ -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:
diff --git a/spin-runtime-class.yaml b/spin-runtime-class.yaml
index 91cfc7c9..4fd6654e 100644
--- a/spin-runtime-class.yaml
+++ b/spin-runtime-class.yaml
@@ -2,4 +2,4 @@ apiVersion: node.k8s.io/v1
 kind: RuntimeClass
 metadata:
   name: wasmtime-spin-v2
-handler: spin
\ No newline at end of file
+handler: spin