api: rename v1alpha1 to v1

PROJECT

@@ -3,5 +3,5 @@ repo: github.com/scylladb/scylla-operator
 resources:
 - group: scylla
   kind: ScyllaCluster
-  version: v1alpha1
+  version: v1
 version: "2"

config/manager/cluster/cluster.yaml

@@ -63,7 +63,7 @@ subjects:
 
 ---
 # Scylla Manager Cluster
-apiVersion: scylla.scylladb.com/v1alpha1
+apiVersion: scylla.scylladb.com/v1
 kind: ScyllaCluster
 metadata:
   name: cluster

config/manager/default/kustomization.yaml

@@ -16,31 +16,31 @@ vars:
   objref:
     group: scylla.scylladb.com
     kind: ScyllaCluster
-    version: v1alpha1
+    version: v1
     name: cluster
   fieldref:
     fieldpath: metadata.name
 - name: MANAGER_CLUSTER_DC
   objref:
     kind: ScyllaCluster
     group: scylla.scylladb.com
-    version: v1alpha1
+    version: v1
     name: cluster
   fieldref:
     fieldpath: spec.datacenter.name
 - name: MANAGER_CLUSTER_RACK
   objref:
     kind: ScyllaCluster
     group: scylla.scylladb.com
-    version: v1alpha1
+    version: v1
     name: cluster
   fieldref:
     fieldpath: spec.datacenter.racks[0].name
 - name: MANAGER_CLUSTER_NAMESPACE
   objref:
     kind: ScyllaCluster
     group: scylla.scylladb.com
-    version: v1alpha1
+    version: v1
     name: cluster
   fieldref:
     fieldpath: metadata.namespace

config/operator/crd/bases/scylla.scylladb.com_scyllaclusters.yaml

@@ -1705,9 +1705,9 @@ spec:
               type: object
           type: object
       type: object
-  version: v1alpha1
+  version: v1
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:

config/operator/webhook/manifests.yaml

@@ -11,14 +11,14 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-scylla-scylladb-com-v1alpha1-scyllacluster
+      path: /mutate-scylla-scylladb-com-v1-scyllacluster
   failurePolicy: Fail
   name: webhook.scylla.scylladb.com
   rules:
   - apiGroups:
     - scylla.scylladb.com
     apiVersions:
-    - v1alpha1
+    - v1
     operations:
     - CREATE
     - UPDATE
@@ -37,14 +37,14 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-scylla-scylladb-com-v1alpha1-scyllacluster
+      path: /validate-scylla-scylladb-com-v1-scyllacluster
   failurePolicy: Fail
   name: webhook.scylla.scylladb.com
   rules:
   - apiGroups:
     - scylla.scylladb.com
     apiVersions:
-    - v1alpha1
+    - v1
     operations:
     - CREATE
     - UPDATE

docs/source/scylla_cluster_crd.md

@@ -8,7 +8,7 @@ This page will explain all the available configuration options on the Scylla CRD
 ## Sample
 
 ```yaml
-apiVersion: scylla.scylladb.com/v1alpha1
+apiVersion: scylla.scylladb.com/v1
 kind: ScyllaCluster
 metadata:
   name: simple-cluster

examples/common/manager.yaml

@@ -248,7 +248,7 @@ spec:
           name: scylla-manager-manager-config-2tfggm9842
         name: scylla-manager-config-volume
 ---
-apiVersion: scylla.scylladb.com/v1alpha1
+apiVersion: scylla.scylladb.com/v1
 kind: ScyllaCluster
 metadata:
   name: scylla-manager-cluster

examples/common/operator.yaml

@@ -1720,9 +1720,9 @@ spec:
               type: object
           type: object
       type: object
-  version: v1alpha1
+  version: v1
   versions:
-  - name: v1alpha1
+  - name: v1
     served: true
     storage: true
 status:
@@ -1745,14 +1745,14 @@ webhooks:
     service:
       name: scylla-operator-webhook-service
       namespace: scylla-operator-system
-      path: /mutate-scylla-scylladb-com-v1alpha1-scyllacluster
+      path: /mutate-scylla-scylladb-com-v1-scyllacluster
   failurePolicy: Fail
   name: webhook.scylla.scylladb.com
   rules:
   - apiGroups:
     - scylla.scylladb.com
     apiVersions:
-    - v1alpha1
+    - v1
     operations:
     - CREATE
     - UPDATE
@@ -1985,14 +1985,14 @@ webhooks:
     service:
       name: scylla-operator-webhook-service
       namespace: scylla-operator-system
-      path: /validate-scylla-scylladb-com-v1alpha1-scyllacluster
+      path: /validate-scylla-scylladb-com-v1-scyllacluster
   failurePolicy: Fail
   name: webhook.scylla.scylladb.com
   rules:
   - apiGroups:
     - scylla.scylladb.com
     apiVersions:
-    - v1alpha1
+    - v1
     operations:
     - CREATE
     - UPDATE

examples/eks/cluster.yaml

@@ -73,7 +73,7 @@ subjects:
 ---
 
 # Scylla Cluster
-apiVersion: scylla.scylladb.com/v1alpha1
+apiVersion: scylla.scylladb.com/v1
 kind: ScyllaCluster
 metadata:
   name: scylla-cluster

examples/generic/cluster.yaml

@@ -73,7 +73,7 @@ subjects:
 ---
 
 # Simple Scylla Cluster
-apiVersion: scylla.scylladb.com/v1alpha1
+apiVersion: scylla.scylladb.com/v1
 kind: ScyllaCluster
 metadata:
   labels:

examples/gke/cluster.yaml

@@ -73,7 +73,7 @@ subjects:
 ---
 
 # Scylla Cluster
-apiVersion: scylla.scylladb.com/v1alpha1
+apiVersion: scylla.scylladb.com/v1
 kind: ScyllaCluster
 metadata:
   labels:

pkg/api/v1alpha1/cluster_types.go → pkg/api/v1/cluster_types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	"github.com/blang/semver"
@@ -314,6 +314,7 @@ const (
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:storageversion
 
 // Cluster is the Schema for the clusters API
 type ScyllaCluster struct {

pkg/api/v1alpha1/cluster_validation.go → pkg/api/v1/cluster_validation.go

@@ -1,4 +1,4 @@
-package v1alpha1
+package v1
 
 import (
 	"reflect"

pkg/api/v1alpha1/cluster_validation_test.go → pkg/api/v1/cluster_validation_test.go

@@ -1,9 +1,9 @@
-package v1alpha1_test
+package v1_test
 
 import (
 	"testing"
 
-	"github.com/scylladb/scylla-operator/pkg/api/v1alpha1"
+	"github.com/scylladb/scylla-operator/pkg/api/v1"
 	"github.com/scylladb/scylla-operator/pkg/test/unit"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
@@ -24,25 +24,25 @@ func TestCheckValues(t *testing.T) {
 	sameName.Spec.Datacenter.Racks = append(sameName.Spec.Datacenter.Racks, sameName.Spec.Datacenter.Racks[0])
 
 	invalidIntensity := validCluster.DeepCopy()
-	invalidIntensity.Spec.Repairs = append(invalidIntensity.Spec.Repairs, v1alpha1.RepairTaskSpec{
+	invalidIntensity.Spec.Repairs = append(invalidIntensity.Spec.Repairs, v1.RepairTaskSpec{
 		Intensity: pointer.StringPtr("100Mib"),
 	})
 
 	nonUniqueManagerTaskNames := validCluster.DeepCopy()
-	nonUniqueManagerTaskNames.Spec.Backups = append(nonUniqueManagerTaskNames.Spec.Backups, v1alpha1.BackupTaskSpec{
-		SchedulerTaskSpec: v1alpha1.SchedulerTaskSpec{
+	nonUniqueManagerTaskNames.Spec.Backups = append(nonUniqueManagerTaskNames.Spec.Backups, v1.BackupTaskSpec{
+		SchedulerTaskSpec: v1.SchedulerTaskSpec{
 			Name: "task-name",
 		},
 	})
-	nonUniqueManagerTaskNames.Spec.Repairs = append(nonUniqueManagerTaskNames.Spec.Repairs, v1alpha1.RepairTaskSpec{
-		SchedulerTaskSpec: v1alpha1.SchedulerTaskSpec{
+	nonUniqueManagerTaskNames.Spec.Repairs = append(nonUniqueManagerTaskNames.Spec.Repairs, v1.RepairTaskSpec{
+		SchedulerTaskSpec: v1.SchedulerTaskSpec{
 			Name: "task-name",
 		},
 	})
 
 	tests := []struct {
 		name    string
-		obj     *v1alpha1.ScyllaCluster
+		obj     *v1.ScyllaCluster
 		allowed bool
 	}{
 		{
@@ -69,7 +69,7 @@ func TestCheckValues(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			err := v1alpha1.CheckValues(test.obj)
+			err := v1.CheckValues(test.obj)
 			if test.allowed {
 				require.NoError(t, err, "Wrong value returned from checkValues function. Message: '%s'", err)
 			} else {
@@ -82,8 +82,8 @@ func TestCheckValues(t *testing.T) {
 func TestCheckTransitions(t *testing.T) {
 	tests := []struct {
 		name    string
-		old     *v1alpha1.ScyllaCluster
-		new     *v1alpha1.ScyllaCluster
+		old     *v1.ScyllaCluster
+		new     *v1.ScyllaCluster
 		allowed bool
 	}{
 		{
@@ -151,7 +151,7 @@ func TestCheckTransitions(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			err := v1alpha1.CheckTransitions(test.old, test.new)
+			err := v1.CheckTransitions(test.old, test.new)
 			if test.allowed {
 				require.NoError(t, err, "Wrong value returned from checkTransitions function. Message: '%s'", err)
 			} else {
@@ -161,24 +161,24 @@ func TestCheckTransitions(t *testing.T) {
 	}
 }
 
-func placementChanged(c *v1alpha1.ScyllaCluster) *v1alpha1.ScyllaCluster {
-	c.Spec.Datacenter.Racks[0].Placement = &v1alpha1.PlacementSpec{}
+func placementChanged(c *v1.ScyllaCluster) *v1.ScyllaCluster {
+	c.Spec.Datacenter.Racks[0].Placement = &v1.PlacementSpec{}
 	return c
 }
 
-func resourceChanged(c *v1alpha1.ScyllaCluster) *v1alpha1.ScyllaCluster {
+func resourceChanged(c *v1.ScyllaCluster) *v1.ScyllaCluster {
 	c.Spec.Datacenter.Racks[0].Resources.Requests = map[corev1.ResourceName]resource.Quantity{
 		corev1.ResourceCPU: *resource.NewMilliQuantity(1000, resource.DecimalSI),
 	}
 	return c
 }
 
-func rackDeleted(c *v1alpha1.ScyllaCluster) *v1alpha1.ScyllaCluster {
+func rackDeleted(c *v1.ScyllaCluster) *v1.ScyllaCluster {
 	c.Spec.Datacenter.Racks = nil
 	return c
 }
 
-func storageChanged(c *v1alpha1.ScyllaCluster) *v1alpha1.ScyllaCluster {
+func storageChanged(c *v1.ScyllaCluster) *v1.ScyllaCluster {
 	c.Spec.Datacenter.Racks[0].Storage.Capacity = "15Gi"
 	return c
 }

pkg/api/v1alpha1/cluster_webhook.go → pkg/api/v1/cluster_webhook.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	"reflect"
@@ -39,8 +39,8 @@ func (r *ScyllaCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/mutate-scylla-scylladb-com-v1alpha1-scyllacluster,mutating=true,failurePolicy=fail,groups=scylla.scylladb.com,resources=scyllaclusters,versions=v1alpha1,name=webhook.scylla.scylladb.com
-// +kubebuilder:webhook:verbs=create;update,path=/validate-scylla-scylladb-com-v1alpha1-scyllacluster,mutating=false,failurePolicy=fail,groups=scylla.scylladb.com,resources=scyllaclusters,versions=v1alpha1,name=webhook.scylla.scylladb.com
+// +kubebuilder:webhook:verbs=create;update,path=/mutate-scylla-scylladb-com-v1-scyllacluster,mutating=true,failurePolicy=fail,groups=scylla.scylladb.com,resources=scyllaclusters,versions=v1,name=webhook.scylla.scylladb.com
+// +kubebuilder:webhook:verbs=create;update,path=/validate-scylla-scylladb-com-v1-scyllacluster,mutating=false,failurePolicy=fail,groups=scylla.scylladb.com,resources=scyllaclusters,versions=v1,name=webhook.scylla.scylladb.com
 
 var _ webhook.Defaulter = &ScyllaCluster{}
 var _ webhook.Validator = &ScyllaCluster{}

pkg/api/v1alpha1/export_test.go → pkg/api/v1/export_test.go

@@ -1,6 +1,6 @@
 // Copyright (C) 2017 ScyllaDB
 
-package v1alpha1
+package v1
 
 func CheckValues(c *ScyllaCluster) error {
 	return checkValues(c)

pkg/api/v1alpha1/groupversion_info.go → pkg/api/v1/groupversion_info.go

@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the scylla v1alpha1 API group
+// Package v1 contains API Schema definitions for the scylla v1 API group
 // +kubebuilder:object:generate=true
 // +groupName=scylla.scylladb.com
-package v1alpha1
+package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "scylla.scylladb.com", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "scylla.scylladb.com", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

pkg/api/v1alpha1/helpers.go → pkg/api/v1/helpers.go

@@ -1,4 +1,4 @@
-package v1alpha1
+package v1
 
 import corev1 "k8s.io/api/core/v1"