Skip to content

Commit

Permalink
Merge pull request #322 from calebschoepp/domain
Browse files Browse the repository at this point in the history
Update the domain from 'spinoperator.dev' to 'spinkube.dev'
  • Loading branch information
calebschoepp authored Oct 28, 2024
2 parents 189f5b5 + e60800f commit 3bccc56
Show file tree
Hide file tree
Showing 48 changed files with 97 additions and 97 deletions.
6 changes: 3 additions & 3 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is used to track the info used to scaffold your project
# and allow the plugins properly work.
# More info: https://book.kubebuilder.io/reference/project-config.html
domain: spinoperator.dev
domain: spinkube.dev
layout:
- go.kubebuilder.io/v4
projectName: spin-operator
Expand All @@ -12,7 +12,7 @@ resources:
crdVersion: v1
namespaced: true
controller: true
domain: spinoperator.dev
domain: spinkube.dev
group: core
kind: SpinApp
path: github.com/spinkube/spin-operator/api/v1alpha1
Expand All @@ -25,7 +25,7 @@ resources:
crdVersion: v1
namespaced: true
controller: true
domain: spinoperator.dev
domain: spinkube.dev
group: core
kind: SpinAppExecutor
path: github.com/spinkube/spin-operator/api/v1alpha1
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

// Package v1alpha1 contains API Schema definitions for the spin v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=core.spinoperator.dev
// +groupName=core.spinkube.dev
package v1alpha1

import (
Expand All @@ -26,7 +26,7 @@ import (

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "core.spinoperator.dev", Version: "v1alpha1"}
GroupVersion = schema.GroupVersion{Group: "core.spinkube.dev", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
Expand Down
2 changes: 1 addition & 1 deletion apps/redis-sample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This is an OCI-compliant package that can be used to demonstrate how a Spin app
Create a Kubernetes manifest file named `redis_client.yaml` with the following code:

```yaml
apiVersion: core.spinoperator.dev/v1alpha1
apiVersion: core.spinkube.dev/v1alpha1
kind: SpinApp
metadata:
name: redis-spinapp
Expand Down
12 changes: 6 additions & 6 deletions charts/spin-operator/README.md
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
```
10 changes: 5 additions & 5 deletions charts/spin-operator/templates/manager-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ rules:
- create
- patch
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinappexecutors
verbs:
Expand All @@ -67,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 @@ -93,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
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func main() {
Metrics: metricsserver.Options{BindAddress: metricsAddr},
HealthProbeBindAddress: probeAddr,
LeaderElection: enableLeaderElection,
LeaderElectionID: "90ba2d18.spinoperator.dev",
LeaderElectionID: "90ba2d18.spinkube.dev",
// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
// when the Manager ends. This requires the binary to immediately end when the
// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/core.spinoperator.dev_spinappexecutors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
name: spinappexecutors.core.spinoperator.dev
name: spinappexecutors.core.spinkube.dev
spec:
group: core.spinoperator.dev
group: core.spinkube.dev
names:
kind: SpinAppExecutor
listKind: SpinAppExecutorList
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/core.spinoperator.dev_spinapps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
name: spinapps.core.spinoperator.dev
name: spinapps.core.spinkube.dev
spec:
group: core.spinoperator.dev
group: core.spinkube.dev
names:
kind: SpinApp
listKind: SpinAppList
Expand Down
4 changes: 2 additions & 2 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
- bases/core.spinoperator.dev_spinapps.yaml
- bases/core.spinoperator.dev_spinappexecutors.yaml
- bases/core.spinkube.dev_spinapps.yaml
- bases/core.spinkube.dev_spinappexecutors.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patches:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/patches/cainjection_in_spinappexecutors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
name: spinappexecutors.core.spinoperator.dev
name: spinappexecutors.core.spinkube.dev
2 changes: 1 addition & 1 deletion config/crd/patches/cainjection_in_spinapps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
name: spinapps.core.spinoperator.dev
name: spinapps.core.spinkube.dev
2 changes: 1 addition & 1 deletion config/crd/patches/webhook_in_spinappexecutors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: spinappexecutors.core.spinoperator.dev
name: spinappexecutors.core.spinkube.dev
spec:
conversion:
strategy: Webhook
Expand Down
2 changes: 1 addition & 1 deletion config/crd/patches/webhook_in_spinapps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: spinapps.core.spinoperator.dev
name: spinapps.core.spinkube.dev
spec:
conversion:
strategy: Webhook
Expand Down
10 changes: 5 additions & 5 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ rules:
- create
- patch
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinappexecutors
verbs:
Expand All @@ -66,21 +66,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 @@ -92,7 +92,7 @@ rules:
- update
- watch
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinapps/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/spinapp_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
name: spinapp-editor-role
rules:
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinapps
verbs:
Expand All @@ -24,7 +24,7 @@ rules:
- update
- watch
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinapps/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/spinapp_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ metadata:
name: spinapp-viewer-role
rules:
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinapps
verbs:
- get
- list
- watch
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinapps/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/spinappexecutor_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
name: spinappexecutor-editor-role
rules:
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinappexecutors
verbs:
Expand All @@ -24,7 +24,7 @@ rules:
- update
- watch
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinappexecutors/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/spinappexecutor_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ metadata:
name: spinappexecutor-viewer-role
rules:
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinappexecutors
verbs:
- get
- list
- watch
- apiGroups:
- core.spinoperator.dev
- core.spinkube.dev
resources:
- spinappexecutors/status
verbs:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/annotations.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1alpha1
apiVersion: core.spinkube.dev/v1alpha1
kind: SpinApp
metadata:
name: annotations-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/hpa.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1alpha1
apiVersion: core.spinkube.dev/v1alpha1
kind: SpinApp
metadata:
name: hpa-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/keda-app.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1alpha1
apiVersion: core.spinkube.dev/v1alpha1
kind: SpinApp
metadata:
name: keda-spinapp
Expand Down
Loading

0 comments on commit 3bccc56

Please sign in to comment.