Fix CR api group name (#16)

Fixes from comments #15 
- Fix API group name for custom resources
- remove unnecessary comment lines

Author: sircthulhu

api/v1alpha1/etcdcluster_types.go

@@ -21,9 +21,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
 type Storage struct {
 	StorageClass string            `json:"storageClass"`
 	Size         resource.Quantity `json:"size"`

api/v1alpha1/groupversion_info.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v1alpha1 contains API Schema definitions for the etcd.aenix.io v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=etcd.aenix.io.etcd.aenix.io
+// +groupName=etcd.aenix.io
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "etcd.aenix.io.etcd.aenix.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "etcd.aenix.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

…aenix.io.etcd.aenix.io_etcdclusters.yaml …rd/bases/etcd.aenix.io_etcdclusters.yamlconfig/crd/bases/etcd.aenix.io.etcd.aenix.io_etcdclusters.yaml renamed to config/crd/bases/etcd.aenix.io_etcdclusters.yaml config/crd/bases/etcd.aenix.io.etcd.aenix.io_etcdclusters.yaml renamed to config/crd/bases/etcd.aenix.io_etcdclusters.yaml

@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: etcdclusters.etcd.aenix.io.etcd.aenix.io
+  name: etcdclusters.etcd.aenix.io
 spec:
-  group: etcd.aenix.io.etcd.aenix.io
+  group: etcd.aenix.io
   names:
     kind: EtcdCluster
     listKind: EtcdClusterList

config/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/etcd.aenix.io.etcd.aenix.io_etcdclusters.yaml
+- bases/etcd.aenix.io_etcdclusters.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patches:

config/rbac/etcdcluster_editor_role.yaml

@@ -12,7 +12,7 @@ metadata:
   name: etcdcluster-editor-role
 rules:
 - apiGroups:
-  - etcd.aenix.io.etcd.aenix.io
+  - etcd.aenix.io
   resources:
   - etcdclusters
   verbs:
@@ -24,7 +24,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - etcd.aenix.io.etcd.aenix.io
+  - etcd.aenix.io
   resources:
   - etcdclusters/status
   verbs:

config/rbac/etcdcluster_viewer_role.yaml

@@ -12,15 +12,15 @@ metadata:
   name: etcdcluster-viewer-role
 rules:
 - apiGroups:
-  - etcd.aenix.io.etcd.aenix.io
+  - etcd.aenix.io
   resources:
   - etcdclusters
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - etcd.aenix.io.etcd.aenix.io
+  - etcd.aenix.io
   resources:
   - etcdclusters/status
   verbs:

config/rbac/role.yaml

@@ -5,7 +5,7 @@ metadata:
   name: manager-role
 rules:
 - apiGroups:
-  - etcd.aenix.io.etcd.aenix.io
+  - etcd.aenix.io
   resources:
   - etcdclusters
   verbs:
@@ -17,13 +17,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - etcd.aenix.io.etcd.aenix.io
+  - etcd.aenix.io
   resources:
   - etcdclusters/finalizers
   verbs:
   - update
 - apiGroups:
-  - etcd.aenix.io.etcd.aenix.io
+  - etcd.aenix.io
   resources:
   - etcdclusters/status
   verbs:

config/samples/etcd.aenix.io_v1alpha1_etcdcluster.yaml

@@ -1,4 +1,4 @@
-apiVersion: etcd.aenix.io.etcd.aenix.io/v1alpha1
+apiVersion: etcd.aenix.io/v1alpha1
 kind: EtcdCluster
 metadata:
   labels:

internal/controller/etcdcluster_controller.go

@@ -33,9 +33,9 @@ type EtcdClusterReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=etcd.aenix.io.etcd.aenix.io,resources=etcdclusters,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=etcd.aenix.io.etcd.aenix.io,resources=etcdclusters/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=etcd.aenix.io.etcd.aenix.io,resources=etcdclusters/finalizers,verbs=update
+//+kubebuilder:rbac:groups=etcd.aenix.io,resources=etcdclusters,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=etcd.aenix.io,resources=etcdclusters/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=etcd.aenix.io,resources=etcdclusters/finalizers,verbs=update
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.