Rename Cluster to ScyllaCluster

This patch update the human written code to replace Cluster with
ScyllaCluster and ClusterList with ScyllaClusterList.

config/operator/crd/kustomization.yaml

@@ -2,7 +2,7 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/scylla.scylladb.com_clusters.yaml
+- bases/scylla.scylladb.com_scyllaclusters.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

config/operator/crd/patches/cainjection_in_clusters.yaml

@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: clusters.scylla.scylladb.com
+  name: scyllaclusters.scylla.scylladb.com

config/operator/crd/patches/webhook_in_clusters.yaml

@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: clusters.scylla.scylladb.com
+  name: scyllaclusters.scylla.scylladb.com
 spec:
   preserveUnknownFields: false
   conversion:

pkg/api/v1alpha1/cluster_types.go

@@ -253,7 +253,7 @@ const (
 // +kubebuilder:subresource:status
 
 // Cluster is the Schema for the clusters API
-type Cluster struct {
+type ScyllaCluster struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
@@ -264,10 +264,10 @@ type Cluster struct {
 // +kubebuilder:object:root=true
 
 // ClusterList contains a list of Cluster
-type ClusterList struct {
+type ScyllaClusterList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Cluster `json:"items"`
+	Items           []ScyllaCluster `json:"items"`
 }
 
 // Version of scylla docker starting from which passing arguments via entry-point is supported
@@ -279,5 +279,5 @@ func init() {
 	if ScyllaVersionThatSupportsArgs, err = semver.Parse(ScyllaVersionThatSupportsArgsText); err != nil {
 		panic(err)
 	}
-	SchemeBuilder.Register(&Cluster{}, &ClusterList{})
+	SchemeBuilder.Register(&ScyllaCluster{}, &ScyllaClusterList{})
 }

pkg/api/v1alpha1/cluster_validation.go

@@ -8,7 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
-func checkValues(c *Cluster) error {
+func checkValues(c *ScyllaCluster) error {
 	rackNames := sets.NewString()
 
 	if len(c.Spec.ScyllaArgs) > 0 {
@@ -59,7 +59,7 @@ func checkValues(c *Cluster) error {
 	return nil
 }
 
-func checkTransitions(old, new *Cluster) error {
+func checkTransitions(old, new *ScyllaCluster) error {
 	oldVersion, err := semver.Parse(old.Spec.Version)
 	if err != nil {
 		return errors.Errorf("invalid old semantic version, err=%s", err)

pkg/api/v1alpha1/cluster_validation_test.go

@@ -25,7 +25,7 @@ func TestCheckValues(t *testing.T) {
 
 	tests := []struct {
 		name    string
-		obj     *v1alpha1.Cluster
+		obj     *v1alpha1.ScyllaCluster
 		allowed bool
 	}{
 		{
@@ -55,8 +55,8 @@ func TestCheckValues(t *testing.T) {
 func TestCheckTransitions(t *testing.T) {
 	tests := []struct {
 		name    string
-		old     *v1alpha1.Cluster
-		new     *v1alpha1.Cluster
+		old     *v1alpha1.ScyllaCluster
+		new     *v1alpha1.ScyllaCluster
 		allowed bool
 	}{
 		{
@@ -140,32 +140,32 @@ func TestCheckTransitions(t *testing.T) {
 	}
 }
 
-func placementChanged(c *v1alpha1.Cluster) *v1alpha1.Cluster {
+func placementChanged(c *v1alpha1.ScyllaCluster) *v1alpha1.ScyllaCluster {
 	c.Spec.Datacenter.Racks[0].Placement = &v1alpha1.PlacementSpec{}
 	return c
 }
 
-func resourceChanged(c *v1alpha1.Cluster) *v1alpha1.Cluster {
+func resourceChanged(c *v1alpha1.ScyllaCluster) *v1alpha1.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.Cluster) *v1alpha1.Cluster {
+func rackDeleted(c *v1alpha1.ScyllaCluster) *v1alpha1.ScyllaCluster {
 	c.Spec.Datacenter.Racks = nil
 	return c
 }
 
-func sidecarImageChanged(c *v1alpha1.Cluster) *v1alpha1.Cluster {
+func sidecarImageChanged(c *v1alpha1.ScyllaCluster) *v1alpha1.ScyllaCluster {
 	c.Spec.SidecarImage = &v1alpha1.ImageSpec{
 		Version:    "1.0.0",
 		Repository: "my-private-repo",
 	}
 	return c
 }
 
-func storageChanged(c *v1alpha1.Cluster) *v1alpha1.Cluster {
+func storageChanged(c *v1alpha1.ScyllaCluster) *v1alpha1.ScyllaCluster {
 	c.Spec.Datacenter.Racks[0].Storage.Capacity = "15Gi"
 	return c
 }

pkg/api/v1alpha1/cluster_webhook.go

@@ -27,7 +27,7 @@ import (
 // log is for logging in this package.
 var clusterlog = logf.Log.WithName("cluster-resource")
 
-func (r *Cluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
+func (r *ScyllaCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(r).
 		Complete()
@@ -37,12 +37,12 @@ func (r *Cluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 //
 
 // +kubebuilder:webhook:path=/validate-scylla-scylladb-com-v1alpha1-cluster,failurePolicy=fail,groups=scylla.scylladb.com,resources=clusters,verbs=create;update,versions=v1alpha1,name=webhook.scylla.scylladb.com,mutating=false
-var _ webhook.Validator = &Cluster{}
+var _ webhook.Validator = &ScyllaCluster{}
 
 // +kubebuilder:webhook:path=/mutate-scylla-scylladb-com-v1alpha1-cluster,failurePolicy=fail,groups=scylla.scylladb.com,resources=clusters,verbs=create;update,versions=v1alpha1,name=webhook.scylla.scylladb.com,mutating=true
-var _ webhook.Defaulter = &Cluster{}
+var _ webhook.Defaulter = &ScyllaCluster{}
 
-func (c *Cluster) Default() {
+func (c *ScyllaCluster) Default() {
 	for i, repairTask := range c.Spec.Repairs {
 		if repairTask.StartDate == nil {
 			c.Spec.Repairs[i].StartDate = pointer.StringPtr("now")
@@ -75,7 +75,7 @@ func (c *Cluster) Default() {
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *Cluster) ValidateCreate() error {
+func (r *ScyllaCluster) ValidateCreate() error {
 	clusterlog.Info("validate create", "name", r.Name)
 
 	// First, check the values
@@ -87,23 +87,23 @@ func (r *Cluster) ValidateCreate() error {
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *Cluster) ValidateUpdate(old runtime.Object) error {
+func (r *ScyllaCluster) ValidateUpdate(old runtime.Object) error {
 	clusterlog.Info("validate update", "name", r.Name)
 
 	// First, check the values
 	if err := checkValues(r); err != nil {
 		return err
 	}
 
-	if err := checkTransitions(old.(*Cluster), r); err != nil {
+	if err := checkTransitions(old.(*ScyllaCluster), r); err != nil {
 		return err
 	}
 
 	return nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *Cluster) ValidateDelete() error {
+func (r *ScyllaCluster) ValidateDelete() error {
 	clusterlog.Info("validate delete", "name", r.Name)
 	// no validation during delete
 	return nil

pkg/api/v1alpha1/export_test.go

@@ -2,10 +2,10 @@
 
 package v1alpha1
 
-func CheckValues(c *Cluster) error {
+func CheckValues(c *ScyllaCluster) error {
 	return checkValues(c)
 }
 
-func CheckTransitions(old, new *Cluster) error {
+func CheckTransitions(old, new *ScyllaCluster) error {
 	return checkTransitions(old, new)
 }

pkg/cmd/operator.go

@@ -55,7 +55,7 @@ func newOperatorCmd(ctx context.Context, logger log.Logger, level zap.AtomicLeve
 
 			// Enable webhook if requested
 			if opts.EnableAdmissionWebhook {
-				if err = (&v1alpha1.Cluster{}).SetupWebhookWithManager(mgr); err != nil {
+				if err = (&v1alpha1.ScyllaCluster{}).SetupWebhookWithManager(mgr); err != nil {
 					logger.Fatal(ctx, "unable to add web hook to manager", "error", err)
 				}
 			}

pkg/controllers/cluster/actions/create.go

@@ -21,11 +21,11 @@ var _ Action = &RackCreate{}
 
 type RackCreate struct {
 	Rack          scyllav1alpha1.RackSpec
-	Cluster       *scyllav1alpha1.Cluster
+	Cluster       *scyllav1alpha1.ScyllaCluster
 	OperatorImage string
 }
 
-func NewRackCreateAction(r scyllav1alpha1.RackSpec, c *scyllav1alpha1.Cluster, image string) *RackCreate {
+func NewRackCreateAction(r scyllav1alpha1.RackSpec, c *scyllav1alpha1.ScyllaCluster, image string) *RackCreate {
 	return &RackCreate{
 		Rack:          r,
 		Cluster:       c,

pkg/controllers/cluster/actions/scale_down.go

@@ -19,10 +19,10 @@ var _ Action = &RackScaleDown{}
 
 type RackScaleDown struct {
 	Rack    scyllav1alpha1.RackSpec
-	Cluster *scyllav1alpha1.Cluster
+	Cluster *scyllav1alpha1.ScyllaCluster
 }
 
-func NewRackScaleDownAction(r scyllav1alpha1.RackSpec, c *scyllav1alpha1.Cluster) *RackScaleDown {
+func NewRackScaleDownAction(r scyllav1alpha1.RackSpec, c *scyllav1alpha1.ScyllaCluster) *RackScaleDown {
 	return &RackScaleDown{
 		Rack:    r,
 		Cluster: c,

pkg/controllers/cluster/actions/scale_up.go

@@ -19,10 +19,10 @@ var _ Action = &RackScaleUp{}
 
 type RackScaleUp struct {
 	Rack    scyllav1alpha1.RackSpec
-	Cluster *scyllav1alpha1.Cluster
+	Cluster *scyllav1alpha1.ScyllaCluster
 }
 
-func NewRackScaleUpAction(r scyllav1alpha1.RackSpec, c *scyllav1alpha1.Cluster) *RackScaleUp {
+func NewRackScaleUpAction(r scyllav1alpha1.RackSpec, c *scyllav1alpha1.ScyllaCluster) *RackScaleUp {
 	return &RackScaleUp{
 		Rack:    r,
 		Cluster: c,

pkg/controllers/cluster/actions/upgrade_version.go

@@ -19,11 +19,11 @@ const (
 )
 
 type ClusterVersionUpgrade struct {
-	Cluster *scyllav1alpha1.Cluster
+	Cluster *scyllav1alpha1.ScyllaCluster
 	logger  log.Logger
 }
 
-func NewClusterVersionUpgradeAction(c *scyllav1alpha1.Cluster, l log.Logger) *ClusterVersionUpgrade {
+func NewClusterVersionUpgradeAction(c *scyllav1alpha1.ScyllaCluster, l log.Logger) *ClusterVersionUpgrade {
 	return &ClusterVersionUpgrade{
 		Cluster: c,
 		logger:  l,

pkg/controllers/cluster/cleanup.go

@@ -14,7 +14,7 @@ import (
 )
 
 // cleanup deletes all resources remaining because of cluster scale downs
-func (cc *ClusterReconciler) cleanup(ctx context.Context, c *scyllav1alpha1.Cluster) error {
+func (cc *ClusterReconciler) cleanup(ctx context.Context, c *scyllav1alpha1.ScyllaCluster) error {
 	svcList := &corev1.ServiceList{}
 	sts := &appsv1.StatefulSet{}
 	logger := cc.Logger.With("cluster", c.Namespace+"/"+c.Name, "resourceVersion", c.ResourceVersion)
@@ -68,7 +68,7 @@ func (cc *ClusterReconciler) cleanup(ctx context.Context, c *scyllav1alpha1.Clus
 // Currently those are :
 //  - A PVC
 //  - A ClusterIP Service
-func (cc *ClusterReconciler) cleanupMemberResources(ctx context.Context, memberService *corev1.Service, r scyllav1alpha1.RackSpec, c *scyllav1alpha1.Cluster) error {
+func (cc *ClusterReconciler) cleanupMemberResources(ctx context.Context, memberService *corev1.Service, r scyllav1alpha1.RackSpec, c *scyllav1alpha1.ScyllaCluster) error {
 	memberName := memberService.Name
 	logger := util.LoggerForCluster(c)
 	logger.Info(ctx, "Cleaning up resources for member", "name", memberName)

pkg/controllers/cluster/cluster_controller.go

@@ -94,7 +94,7 @@ func (cc *ClusterReconciler) Reconcile(request ctrl.Request) (ctrl.Result, error
 	ctx := log.WithNewTraceID(context.Background())
 	cc.Logger.Debug(ctx, "Reconcile request", "request", request.String())
 	// Fetch the Cluster instance
-	c := &scyllav1alpha1.Cluster{}
+	c := &scyllav1alpha1.ScyllaCluster{}
 	err := cc.UncachedClient.Get(ctx, request.NamespacedName, c)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
@@ -144,8 +144,8 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	//////////////////////////////////
 	clusterSpecChangedPredicate := predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
-			oldCluster := e.ObjectOld.(*scyllav1alpha1.Cluster)
-			newCluster := e.ObjectNew.(*scyllav1alpha1.Cluster)
+			oldCluster := e.ObjectOld.(*scyllav1alpha1.ScyllaCluster)
+			newCluster := e.ObjectNew.(*scyllav1alpha1.ScyllaCluster)
 			if reflect.DeepEqual(oldCluster, newCluster) {
 				return false
 			}
@@ -154,7 +154,7 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	}
 
 	err = c.Watch(
-		&source.Kind{Type: &scyllav1alpha1.Cluster{}},
+		&source.Kind{Type: &scyllav1alpha1.ScyllaCluster{}},
 		&handler.EnqueueRequestForObject{},
 		predicate.ResourceVersionChangedPredicate{},
 		clusterSpecChangedPredicate,
@@ -171,7 +171,7 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		&source.Kind{Type: &appsv1.StatefulSet{}},
 		&handler.EnqueueRequestForOwner{
 			IsController: true,
-			OwnerType:    &scyllav1alpha1.Cluster{},
+			OwnerType:    &scyllav1alpha1.ScyllaCluster{},
 		},
 		predicate.ResourceVersionChangedPredicate{},
 	)
@@ -187,7 +187,7 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		&source.Kind{Type: &corev1.Service{}},
 		&handler.EnqueueRequestForOwner{
 			IsController: true,
-			OwnerType:    &scyllav1alpha1.Cluster{},
+			OwnerType:    &scyllav1alpha1.ScyllaCluster{},
 		},
 		predicate.ResourceVersionChangedPredicate{},
 	)