Fix group name infrastructure.clusterstack.x-k8s.io (#14)

chess-knight · matofeder · web-flow · commit 88b12a6d4acc · 2023-12-19T11:29:43.000+01:00
Signed-off-by: Roman Hros &lt;roman.hros@dnation.cloud&gt;
Co-authored-by: Matej Feder &lt;feder.mato@gmail.com&gt;
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 infrastructure.clusterstack.x-k8s.io v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+// +groupName=infrastructure.clusterstack.x-k8s.io
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "infrastructure.clusterstack.x-k8s.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
diff --git a/config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleases.yaml b/config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleases.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
-  name: openstackclusterstackreleases.infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  name: openstackclusterstackreleases.infrastructure.clusterstack.x-k8s.io
 spec:
-  group: infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  group: infrastructure.clusterstack.x-k8s.io
   names:
     kind: OpenstackClusterStackRelease
     listKind: OpenstackClusterStackReleaseList
diff --git a/config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml b/config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
-  name: openstackclusterstackreleasetemplates.infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  name: openstackclusterstackreleasetemplates.infrastructure.clusterstack.x-k8s.io
 spec:
-  group: infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  group: infrastructure.clusterstack.x-k8s.io
   names:
     kind: OpenstackClusterStackReleaseTemplate
     listKind: OpenstackClusterStackReleaseTemplateList
diff --git a/config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstacknodeimagereleases.yaml b/config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstacknodeimagereleases.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
-  name: openstacknodeimagereleases.infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  name: openstacknodeimagereleases.infrastructure.clusterstack.x-k8s.io
 spec:
-  group: infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  group: infrastructure.clusterstack.x-k8s.io
   names:
     kind: OpenstackNodeImageRelease
     listKind: OpenstackNodeImageReleaseList
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,9 +2,9 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstackclusterstackreleases.yaml
-- bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml
-- bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstacknodeimagereleases.yaml
+- bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleases.yaml
+- bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml
+- bases/infrastructure.clusterstack.x-k8s.io_openstacknodeimagereleases.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patches:
diff --git a/config/rbac/openstackclusterstackrelease_editor_role.yaml b/config/rbac/openstackclusterstackrelease_editor_role.yaml
@@ -12,7 +12,7 @@ metadata:
   name: openstackclusterstackrelease-editor-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases
   verbs:
@@ -24,7 +24,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases/status
   verbs:
diff --git a/config/rbac/openstackclusterstackrelease_viewer_role.yaml b/config/rbac/openstackclusterstackrelease_viewer_role.yaml
@@ -12,15 +12,15 @@ metadata:
   name: openstackclusterstackrelease-viewer-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases/status
   verbs:
diff --git a/config/rbac/openstackclusterstackreleasetemplate_editor_role.yaml b/config/rbac/openstackclusterstackreleasetemplate_editor_role.yaml
@@ -12,7 +12,7 @@ metadata:
   name: openstackclusterstackreleasetemplate-editor-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates
   verbs:
@@ -24,7 +24,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates/status
   verbs:
diff --git a/config/rbac/openstackclusterstackreleasetemplate_viewer_role.yaml b/config/rbac/openstackclusterstackreleasetemplate_viewer_role.yaml
@@ -12,15 +12,15 @@ metadata:
   name: openstackclusterstackreleasetemplate-viewer-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates/status
   verbs:
diff --git a/config/rbac/openstacknodeimagerelease_editor_role.yaml b/config/rbac/openstacknodeimagerelease_editor_role.yaml
@@ -12,7 +12,7 @@ metadata:
   name: openstacknodeimagerelease-editor-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases
   verbs:
@@ -24,7 +24,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases/status
   verbs:
diff --git a/config/rbac/openstacknodeimagerelease_viewer_role.yaml b/config/rbac/openstacknodeimagerelease_viewer_role.yaml
@@ -12,15 +12,15 @@ metadata:
   name: openstacknodeimagerelease-viewer-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases/status
   verbs:
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: manager-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases
   verbs:
@@ -17,21 +17,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases/finalizers
   verbs:
   - update
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates
   verbs:
@@ -43,21 +43,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates/finalizers
   verbs:
   - update
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases
   verbs:
@@ -69,13 +69,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases/finalizers
   verbs:
   - update
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases/status
   verbs:
diff --git a/internal/controller/openstackclusterstackrelease_controller.go b/internal/controller/openstackclusterstackrelease_controller.go
@@ -32,9 +32,9 @@ type OpenstackClusterStackReleaseReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io,resources=openstackclusterstackreleases,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io,resources=openstackclusterstackreleases/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io,resources=openstackclusterstackreleases/finalizers,verbs=update
+//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io,resources=openstackclusterstackreleases,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io,resources=openstackclusterstackreleases/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io,resources=openstackclusterstackreleases/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/openstackclusterstackreleasetemplate_controller.go b/internal/controller/openstackclusterstackreleasetemplate_controller.go
@@ -32,9 +32,9 @@ type OpenstackClusterStackReleaseTemplateReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io,resources=openstackclusterstackreleasetemplates,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io,resources=openstackclusterstackreleasetemplates/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io,resources=openstackclusterstackreleasetemplates/finalizers,verbs=update
+//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io,resources=openstackclusterstackreleasetemplates,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io,resources=openstackclusterstackreleasetemplates/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io,resources=openstackclusterstackreleasetemplates/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/openstacknodeimagerelease_controller.go b/internal/controller/openstacknodeimagerelease_controller.go
@@ -33,9 +33,9 @@ type OpenstackNodeImageReleaseReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io,resources=openstacknodeimagereleases,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io,resources=openstacknodeimagereleases/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io,resources=openstacknodeimagereleases/finalizers,verbs=update
+//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io,resources=openstacknodeimagereleases,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io,resources=openstacknodeimagereleases/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=infrastructure.clusterstack.x-k8s.io,resources=openstacknodeimagereleases/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.
