Skip to content

Commit

Permalink
Merge pull request #140 from spinkube/become-alpha
Browse files Browse the repository at this point in the history
ref(*): Change group versions from v1 to v1alpha1
  • Loading branch information
calebschoepp authored Mar 7, 2024
2 parents 88ea720 + 736864b commit f7068bc
Show file tree
Hide file tree
Showing 43 changed files with 224 additions and 224 deletions.
8 changes: 4 additions & 4 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ resources:
domain: spinoperator.dev
group: core
kind: SpinApp
path: github.com/spinkube/spin-operator/api/v1
version: v1
path: github.com/spinkube/spin-operator/api/v1alpha1
version: v1alpha1
webhooks:
defaulting: true
validation: true
Expand All @@ -28,8 +28,8 @@ resources:
domain: spinoperator.dev
group: core
kind: SpinAppExecutor
path: github.com/spinkube/spin-operator/api/v1
version: v1
path: github.com/spinkube/spin-operator/api/v1alpha1
version: v1alpha1
webhooks:
defaulting: true
validation: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

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

import (
"k8s.io/apimachinery/pkg/runtime/schema"
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: "v1"}
GroupVersion = schema.GroupVersion{Group: "core.spinoperator.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 api/v1/spinapp_types.go → api/v1alpha1/spinapp_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
corev1 "k8s.io/api/core/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ webhooks:
service:
name: '{{ include "spin-operator.fullname" . }}-webhook-service'
namespace: '{{ .Release.Namespace }}'
path: /mutate-core-spinoperator-dev-v1-spinapp
path: /mutate-core-spinoperator-dev-v1alpha1-spinapp
failurePolicy: Fail
name: mspinapp.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
apiVersions:
- v1
- v1alpha1
operations:
- CREATE
- UPDATE
Expand All @@ -33,14 +33,14 @@ webhooks:
service:
name: '{{ include "spin-operator.fullname" . }}-webhook-service'
namespace: '{{ .Release.Namespace }}'
path: /mutate-core-spinoperator-dev-v1-spinappexecutor
path: /mutate-core-spinoperator-dev-v1alpha1-spinappexecutor
failurePolicy: Fail
name: mspinappexecutor.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
apiVersions:
- v1
- v1alpha1
operations:
- CREATE
- UPDATE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ webhooks:
service:
name: '{{ include "spin-operator.fullname" . }}-webhook-service'
namespace: '{{ .Release.Namespace }}'
path: /validate-core-spinoperator-dev-v1-spinapp
path: /validate-core-spinoperator-dev-v1alpha1-spinapp
failurePolicy: Fail
name: vspinapp.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
apiVersions:
- v1
- v1alpha1
operations:
- CREATE
- UPDATE
Expand All @@ -33,14 +33,14 @@ webhooks:
service:
name: '{{ include "spin-operator.fullname" . }}-webhook-service'
namespace: '{{ .Release.Namespace }}'
path: /validate-core-spinoperator-dev-v1-spinappexecutor
path: /validate-core-spinoperator-dev-v1alpha1-spinappexecutor
failurePolicy: Fail
name: vspinappexecutor.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
apiVersions:
- v1
- v1alpha1
operations:
- CREATE
- UPDATE
Expand Down
4 changes: 2 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

spinv1 "github.com/spinkube/spin-operator/api/v1"
spinv1alpha1 "github.com/spinkube/spin-operator/api/v1alpha1"
"github.com/spinkube/spin-operator/internal/controller"
"github.com/spinkube/spin-operator/internal/webhook"
//+kubebuilder:scaffold:imports
Expand All @@ -48,7 +48,7 @@ var (
func init() {
utilruntime.Must(clientgoscheme.AddToScheme(scheme))

utilruntime.Must(spinv1.AddToScheme(scheme))
utilruntime.Must(spinv1alpha1.AddToScheme(scheme))
//+kubebuilder:scaffold:scheme
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
singular: spinappexecutor
scope: Namespaced
versions:
- name: v1
- name: v1alpha1
schema:
openAPIV3Schema:
description: SpinAppExecutor is the Schema for the spinappexecutors API
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/core.spinoperator.dev_spinapps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- jsonPath: .spec.executor
name: Executor
type: string
name: v1
name: v1alpha1
schema:
openAPIV3Schema:
description: SpinApp is the Schema for the spinapps API
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/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: annotations-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/cyclotron.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: cyclotron-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/v1
apiVersion: core.spinoperator.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/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: keda-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/private-image.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: private-image-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/probes.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: spinoperator.dev/v1
apiVersion: spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: healthchecks-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/redis.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: redis-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/resources.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: resource-requirements-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/runtime-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: runtime-config
Expand Down
2 changes: 1 addition & 1 deletion config/samples/simple.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: simple-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/spin-shim-executor.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinAppExecutor
metadata:
name: containerd-shim-spin
Expand Down
2 changes: 1 addition & 1 deletion config/samples/variable-explorer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ data:
password: c2VjcmV0X3NhdWNlCg==
---
kind: SpinApp
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
metadata:
name: variable-explorer
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/variables.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: variables-spinapp
Expand Down
2 changes: 1 addition & 1 deletion config/samples/volume-mount.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: core.spinoperator.dev/v1
apiVersion: core.spinoperator.dev/v1alpha1
kind: SpinApp
metadata:
name: volume-mount-spinapp
Expand Down
16 changes: 8 additions & 8 deletions config/webhook/manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ webhooks:
service:
name: webhook-service
namespace: system
path: /mutate-core-spinoperator-dev-v1-spinapp
path: /mutate-core-spinoperator-dev-v1alpha1-spinapp
failurePolicy: Fail
name: mspinapp.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
apiVersions:
- v1
- v1alpha1
operations:
- CREATE
- UPDATE
Expand All @@ -30,14 +30,14 @@ webhooks:
service:
name: webhook-service
namespace: system
path: /mutate-core-spinoperator-dev-v1-spinappexecutor
path: /mutate-core-spinoperator-dev-v1alpha1-spinappexecutor
failurePolicy: Fail
name: mspinappexecutor.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
apiVersions:
- v1
- v1alpha1
operations:
- CREATE
- UPDATE
Expand All @@ -56,14 +56,14 @@ webhooks:
service:
name: webhook-service
namespace: system
path: /validate-core-spinoperator-dev-v1-spinapp
path: /validate-core-spinoperator-dev-v1alpha1-spinapp
failurePolicy: Fail
name: vspinapp.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
apiVersions:
- v1
- v1alpha1
operations:
- CREATE
- UPDATE
Expand All @@ -76,14 +76,14 @@ webhooks:
service:
name: webhook-service
namespace: system
path: /validate-core-spinoperator-dev-v1-spinappexecutor
path: /validate-core-spinoperator-dev-v1alpha1-spinappexecutor
failurePolicy: Fail
name: vspinappexecutor.kb.io
rules:
- apiGroups:
- core.spinoperator.dev
apiVersions:
- v1
- v1alpha1
operations:
- CREATE
- UPDATE
Expand Down
Loading

0 comments on commit f7068bc

Please sign in to comment.