Remove duplicates in CRD group

Signed-off-by: Andrei Pavlov <[email protected]>
Mirantis · May 29, 2024 · 67b54ef · 67b54ef
1 parent 221ad98
commit 67b54ef
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 34 deletions.
diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v1alpha1 contains API Schema definitions for the hmc.mirantis.com v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=hmc.mirantis.com.hmc.mirantis.com
+// +groupName=hmc.mirantis.com
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "hmc.mirantis.com.hmc.mirantis.com", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "hmc.mirantis.com", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/...is.com.hmc.mirantis.com_awsproviders.yaml → .../bases/hmc.mirantis.com_awsproviders.yaml b/...is.com.hmc.mirantis.com_awsproviders.yaml → .../bases/hmc.mirantis.com_awsproviders.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: awsproviders.hmc.mirantis.com.hmc.mirantis.com
+  name: awsproviders.hmc.mirantis.com
 spec:
-  group: hmc.mirantis.com.hmc.mirantis.com
+  group: hmc.mirantis.com
   names:
     kind: AWSProvider
     listKind: AWSProviderList

diff --git a/...tis.com.hmc.mirantis.com_deployments.yaml → ...d/bases/hmc.mirantis.com_deployments.yaml b/...tis.com.hmc.mirantis.com_deployments.yaml → ...d/bases/hmc.mirantis.com_deployments.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: deployments.hmc.mirantis.com.hmc.mirantis.com
+  name: deployments.hmc.mirantis.com
 spec:
-  group: hmc.mirantis.com.hmc.mirantis.com
+  group: hmc.mirantis.com
   names:
     kind: Deployment
     listKind: DeploymentList

diff --git a/...tis.com.hmc.mirantis.com_managements.yaml → ...d/bases/hmc.mirantis.com_managements.yaml b/...tis.com.hmc.mirantis.com_managements.yaml → ...d/bases/hmc.mirantis.com_managements.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: managements.hmc.mirantis.com.hmc.mirantis.com
+  name: managements.hmc.mirantis.com
 spec:
-  group: hmc.mirantis.com.hmc.mirantis.com
+  group: hmc.mirantis.com
   names:
     kind: Management
     listKind: ManagementList

diff --git a/...antis.com.hmc.mirantis.com_templates.yaml → ...crd/bases/hmc.mirantis.com_templates.yaml b/...antis.com.hmc.mirantis.com_templates.yaml → ...crd/bases/hmc.mirantis.com_templates.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: templates.hmc.mirantis.com.hmc.mirantis.com
+  name: templates.hmc.mirantis.com
 spec:
-  group: hmc.mirantis.com.hmc.mirantis.com
+  group: hmc.mirantis.com
   names:
     kind: Template
     listKind: TemplateList

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: manager-role
 rules:
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - awsprovider
   verbs:
@@ -17,21 +17,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - awsprovider/finalizers
   verbs:
   - update
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - awsprovider/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - deployments
   verbs:
@@ -43,21 +43,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - deployments/finalizers
   verbs:
   - update
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - deployments/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - managements
   verbs:
@@ -69,21 +69,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - managements/finalizers
   verbs:
   - update
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - managements/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - templates
   verbs:
@@ -95,13 +95,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - templates/finalizers
   verbs:
   - update
 - apiGroups:
-  - hmc.mirantis.com.hmc.mirantis.com
+  - hmc.mirantis.com
   resources:
   - templates/status
   verbs:

diff --git a/internal/controller/hmcdeployment_controller.go b/internal/controller/hmcdeployment_controller.go
@@ -33,9 +33,9 @@ type DeploymentReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=deployments,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=deployments/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=deployments/finalizers,verbs=update
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=deployments,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=deployments/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=deployments/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.

diff --git a/internal/controller/hmcmanagement_controller.go b/internal/controller/hmcmanagement_controller.go
@@ -33,9 +33,9 @@ type ManagementReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=managements,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=managements/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=managements/finalizers,verbs=update
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=managements,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=managements/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=managements/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.

diff --git a/internal/controller/hmcprovideraws_controller.go b/internal/controller/hmcprovideraws_controller.go
@@ -33,9 +33,9 @@ type AWSProviderReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=awsprovider,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=awsprovider/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=awsprovider/finalizers,verbs=update
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=awsprovider,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=awsprovider/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=awsprovider/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.

diff --git a/internal/controller/hmctemplate_controller.go b/internal/controller/hmctemplate_controller.go
@@ -33,9 +33,9 @@ type TemplateReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=templates,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=templates/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=hmc.mirantis.com.hmc.mirantis.com,resources=templates/finalizers,verbs=update
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=templates,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=templates/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=hmc.mirantis.com,resources=templates/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.