api: rename Cluster kind to ScyllaCluster in missing places

Problems sovled: - webhooks were watching old "Cluster" resource - controller wasn't able to update cluster status - controller watch on owned StatefulSet events was registered on old "Cluster" resource Fixes #144
scylladb · Nov 3, 2020 · 978b5fd · 978b5fd
1 parent ab7b235
commit 978b5fd
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/PROJECT b/PROJECT
@@ -2,6 +2,6 @@ domain: scylla.scylladb.com
 repo: github.com/scylladb/scylla-operator
 resources:
 - group: scylla
-  kind: Cluster
+  kind: ScyllaCluster
   version: v1alpha1
 version: "2"
diff --git a/config/manager/cluster/cluster.yaml b/config/manager/cluster/cluster.yaml
@@ -32,7 +32,7 @@ rules:
   - apiGroups:
       - scylla.scylladb.com
     resources:
-      - clusters
+      - scyllaclusters
     verbs:
       - get
 
@@ -64,7 +64,7 @@ subjects:
 ---
 # Scylla Manager Cluster
 apiVersion: scylla.scylladb.com/v1alpha1
-kind: Cluster
+kind: ScyllaCluster
 metadata:
   name: cluster
   namespace: scylla-manager

diff --git a/config/manager/default/kustomization.yaml b/config/manager/default/kustomization.yaml
@@ -15,30 +15,30 @@ vars:
 - name: MANAGER_CLUSTER_NAME
   objref:
     group: scylla.scylladb.com
-    kind: Cluster
+    kind: ScyllaCluster
     version: v1alpha1
     name: cluster
   fieldref:
     fieldpath: metadata.name
 - name: MANAGER_CLUSTER_DC
   objref:
-    kind: Cluster
+    kind: ScyllaCluster
     group: scylla.scylladb.com
     version: v1alpha1
     name: cluster
   fieldref:
     fieldpath: spec.datacenter.name
 - name: MANAGER_CLUSTER_RACK
   objref:
-    kind: Cluster
+    kind: ScyllaCluster
     group: scylla.scylladb.com
     version: v1alpha1
     name: cluster
   fieldref:
     fieldpath: spec.datacenter.racks[0].name
 - name: MANAGER_CLUSTER_NAMESPACE
   objref:
-    kind: Cluster
+    kind: ScyllaCluster
     group: scylla.scylladb.com
     version: v1alpha1
     name: cluster

diff --git a/docs/source/scylla_cluster_crd.md b/docs/source/scylla_cluster_crd.md
@@ -9,7 +9,7 @@ This page will explain all the available configuration options on the Scylla CRD
 
 ```yaml
 apiVersion: scylla.scylladb.com/v1alpha1
-kind: Cluster
+kind: ScyllaCluster
 metadata:
   name: simple-cluster
   namespace: scylla

diff --git a/examples/eks/cluster.yaml b/examples/eks/cluster.yaml
@@ -40,7 +40,7 @@ rules:
   - apiGroups:
       - scylla.scylladb.com
     resources:
-      - clusters
+      - scyllaclusters
     verbs:
       - get
 
@@ -74,7 +74,7 @@ subjects:
 
 # Scylla Cluster
 apiVersion: scylla.scylladb.com/v1alpha1
-kind: Cluster
+kind: ScyllaCluster
 metadata:
   name: scylla-cluster
   namespace: scylla

diff --git a/examples/generic/cluster.yaml b/examples/generic/cluster.yaml
@@ -40,7 +40,7 @@ rules:
   - apiGroups:
       - scylla.scylladb.com
     resources:
-      - clusters
+      - scyllaclusters
     verbs:
       - get
 
@@ -74,7 +74,7 @@ subjects:
 
 # Simple Scylla Cluster
 apiVersion: scylla.scylladb.com/v1alpha1
-kind: Cluster
+kind: ScyllaCluster
 metadata:
   labels:
     controller-tools.k8s.io: "1.0"

diff --git a/examples/gke/cluster.yaml b/examples/gke/cluster.yaml
@@ -40,7 +40,7 @@ rules:
   - apiGroups:
       - scylla.scylladb.com
     resources:
-      - clusters
+      - scyllaclusters
     verbs:
       - get
 
@@ -74,7 +74,7 @@ subjects:
 
 # Scylla Cluster
 apiVersion: scylla.scylladb.com/v1alpha1
-kind: Cluster
+kind: ScyllaCluster
 metadata:
   labels:
     controller-tools.k8s.io: "1.0"

diff --git a/pkg/api/v1alpha1/cluster_types.go b/pkg/api/v1alpha1/cluster_types.go
@@ -216,7 +216,7 @@ type BackupTaskStatus struct {
 	Error          string `json:"error"`
 }
 
-// ClusterStatus defines the observed state of Cluster
+// ClusterStatus defines the observed state of ScyllaCluster
 type ClusterStatus struct {
 	Racks     map[string]RackStatus `json:"racks,omitempty"`
 	ManagerID *string               `json:"managerId,omitempty"`

diff --git a/pkg/controllers/cluster/util/util.go b/pkg/controllers/cluster/util/util.go
@@ -93,6 +93,6 @@ func NewControllerRef(c *scyllav1alpha1.ScyllaCluster) metav1.OwnerReference {
 	return *metav1.NewControllerRef(c, schema.GroupVersionKind{
 		Group:   "scylla.scylladb.com",
 		Version: "v1alpha1",
-		Kind:    "Cluster",
+		Kind:    "ScyllaCluster",
 	})
 }