Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/marketplace-smoke-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
# This version should match the (forked) version of the spin-operator sub-chart
SPIN_OPERATOR_VERSION: v0.3.0
SPIN_OPERATOR_VERSION: v0.4.0

jobs:
helm-install-smoke-test:
Expand Down Expand Up @@ -50,8 +50,8 @@ jobs:
kubectl describe -n spinkube pod -l app.kubernetes.io/name=spin-operator || true
kubectl logs -n spinkube -l app.kubernetes.io/name=kwasm-operator || true
kubectl describe -n spinkube pod -l app.kubernetes.io/name=kwasm-operator || true
kubectl logs -l core.spinoperator.dev/app-name=simple-spinapp || true
kubectl describe pod -l core.spinoperator.dev/app-name=simple-spinapp || true
kubectl logs -l core.spinkube.dev/app-name=simple-spinapp || true
kubectl describe pod -l core.spinkube.dev/app-name=simple-spinapp || true

- name: Verify curl
run: curl localhost:8083/hello
Expand Down
6 changes: 3 additions & 3 deletions Chart.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: spin-operator
repository: oci://ghcr.io/spinkube/charts
version: 0.3.0
version: 0.4.0
- name: cert-manager
repository: https://charts.jetstack.io
version: v1.14.3
- name: kwasm-operator
repository: http://kwasm.sh/kwasm-operator/
version: 0.2.3
digest: sha256:3d3b2ec9e76e9924d6210432c277af05049cb23ecb0e416dce4ba660d1bcbb1d
generated: "2024-09-09T14:38:14.413931+02:00"
digest: sha256:0c192cc2f5c8fd54137c986bfa1278959ccbe64a5e7b58b40d5661a5f34910c0
generated: "2024-11-05T14:48:48.29812-07:00"
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ appVersion: "0.1.0"

dependencies:
- name: spin-operator
version: "0.3.0"
version: "0.4.0"
repository: "oci://ghcr.io/spinkube/charts"
condition: spin-operator.enabled
- name: cert-manager
Expand Down
Binary file removed charts/spin-operator-0.3.0.tgz
Binary file not shown.
Binary file added charts/spin-operator-0.4.0.tgz
Binary file not shown.
169 changes: 77 additions & 92 deletions crds/spin-operator.crds.yaml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions marketplace/charts/spinkube-azure-marketplace/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: spin-operator
repository: file://charts/spin-operator
version: 0.1.0
version: 0.4.0
- name: cert-manager
repository: file://charts/cert-manager
version: v0.1.0
- name: kwasm-operator
repository: file://charts/kwasm-operator
version: 0.2.3
digest: sha256:2b941a3f31eb39c2738e801f30881e3ed734379ae50968cf2419c2929386f4ff
generated: "2024-06-12T14:02:14.844986-06:00"
digest: sha256:692c93c60d865c3fa36a8b60a7761889b5663f25fc5a2838528a1a8e9f8d33e1
generated: "2024-11-05T14:50:24.550048-07:00"
2 changes: 1 addition & 1 deletion marketplace/charts/spinkube-azure-marketplace/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ appVersion: "0.1.0"

dependencies:
- name: spin-operator
version: "0.1.0"
version: "0.4.0"
repository: "file://charts/spin-operator"
condition: spin-operator.enabled
- name: cert-manager
Expand Down
2 changes: 1 addition & 1 deletion marketplace/charts/spinkube-azure-marketplace/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ To comply, all of the sub-charts have been manually forked and updated appropria

- **Spin Operator**

[v0.3.0 tag of spinkube/spin-operator](https://github.com/spinkube/spin-operator/tree/v0.3.0/charts/spin-operator)
[v0.4.0 tag of spinkube/spin-operator](https://github.com/spinkube/spin-operator/tree/v0.4.0/charts/spin-operator)

- **Cert Manager**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ type: application
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
# NOTE: this version is kept static in version control but is bumped when packaging and releasing
version: 0.1.0
version: 0.4.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
# NOTE: this version is kept static in version control but is bumped when packaging and releasing
appVersion: "v0.1.0"
appVersion: "v0.4.0"
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Prior to installing the chart, you'll need to ensure the following:
- spin-operator CustomResourceDefinition (CRD) resources are installed. This includes the SpinApp CRD representing Spin applications to be scheduled on the cluster.

```console
$ kubectl apply -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinoperator.dev_spinapps.yaml
$ kubectl apply -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinoperator.dev_spinappexecutors.yaml
$ kubectl apply -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinkube.dev_spinapps.yaml
$ kubectl apply -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinkube.dev_spinappexecutors.yaml
```

## Installing the chart
Expand Down Expand Up @@ -54,8 +54,8 @@ spin-operator depends on the following resources. If not already present on the
Note that you may also need to upgrade the spin-operator CRDs in tandem with upgrading the Helm release:

```console
$ kubectl apply -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinoperator.dev_spinapps.yaml
$ kubectl apply -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinoperator.dev_spinappexecutors.yaml
$ kubectl apply -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinkube.dev_spinapps.yaml
$ kubectl apply -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinkube.dev_spinappexecutors.yaml
```

To upgrade the `spin-operator` release, run the following:
Expand All @@ -82,6 +82,6 @@ To completely uninstall all resources related to spin-operator, you may want to
```console
$ kubectl delete -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/samples/spin-runtime-class.yaml
$ kubectl delete -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/samples/spin-shim-executor.yaml
$ kubectl delete -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinoperator.dev_spinapps.yaml
$ kubectl delete -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinoperator.dev_spinappexecutors.yaml
$ kubectl delete -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinkube.dev_spinapps.yaml
$ kubectl delete -f https://raw.githubusercontent.com/spinkube/spin-operator/main/config/crd/bases/core.spinkube.dev_spinappexecutors.yaml
```
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@ spec:
annotations:
kubectl.kubernetes.io/default-container: manager
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/arch
operator: In
values:
- amd64
- arm64
- key: kubernetes.io/os
operator: In
values:
- linux
containers:
- args: {{- toYaml .Values.controllerManager.manager.args | nindent 8 }}
command:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,14 @@ rules:
verbs:
- get
- apiGroups:
- core.spinoperator.dev
- ""
resources:
- events
verbs:
- create
- patch
- apiGroups:
- core.spinkube.dev
resources:
- spinappexecutors
verbs:
Expand All @@ -60,21 +67,21 @@ rules:
- update
- watch
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinappexecutors/finalizers
verbs:
- update
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinappexecutors/status
verbs:
- get
- patch
- update
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinapps
verbs:
Expand All @@ -86,7 +93,7 @@ rules:
- update
- watch
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinapps/status
verbs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ webhooks:
service:
name: '{{ include "spin-operator.fullname" . }}-webhook-service'
namespace: '{{ .Release.Namespace }}'
path: /mutate-core-spinoperator-dev-v1alpha1-spinapp
path: /mutate-core-spinkube-dev-v1alpha1-spinapp
failurePolicy: Fail
name: mspinapp.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
apiVersions:
- v1alpha1
operations:
Expand All @@ -33,12 +33,12 @@ webhooks:
service:
name: '{{ include "spin-operator.fullname" . }}-webhook-service'
namespace: '{{ .Release.Namespace }}'
path: /mutate-core-spinoperator-dev-v1alpha1-spinappexecutor
path: /mutate-core-spinkube-dev-v1alpha1-spinappexecutor
failurePolicy: Fail
name: mspinappexecutor.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
apiVersions:
- v1alpha1
operations:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ webhooks:
service:
name: '{{ include "spin-operator.fullname" . }}-webhook-service'
namespace: '{{ .Release.Namespace }}'
path: /validate-core-spinoperator-dev-v1alpha1-spinapp
path: /validate-core-spinkube-dev-v1alpha1-spinapp
failurePolicy: Fail
name: vspinapp.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
apiVersions:
- v1alpha1
operations:
Expand All @@ -33,12 +33,12 @@ webhooks:
service:
name: '{{ include "spin-operator.fullname" . }}-webhook-service'
namespace: '{{ .Release.Namespace }}'
path: /validate-core-spinoperator-dev-v1alpha1-spinappexecutor
path: /validate-core-spinkube-dev-v1alpha1-spinappexecutor
failurePolicy: Fail
name: vspinappexecutor.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
apiVersions:
- v1alpha1
operations:
Expand Down
Loading
Loading