Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Dec 19, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ca0e58
Fix group name infrastructure.clusterstack.x-k8s.io
chess-knight Dec 19, 2023
7d1bde2
Merge branch 'main' into fix/group_name
matofeder Dec 19, 2023
8eb95e8
Merge branch 'main' into fix/group_name
chess-knight Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/v1alpha1/groupversion_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions ...k8s.io_openstackclusterstackreleases.yaml → ...k8s.io_openstackclusterstackreleases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...penstackclusterstackreleasetemplates.yaml → ...penstackclusterstackreleasetemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ....x-k8s.io_openstacknodeimagereleases.yaml → ....x-k8s.io_openstacknodeimagereleases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions config/crd/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/openstackclusterstackrelease_editor_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/openstackclusterstackrelease_viewer_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/openstackclusterstackreleasetemplate_editor_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/openstackclusterstackreleasetemplate_viewer_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/openstacknodeimagerelease_editor_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/openstacknodeimagerelease_viewer_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
18 changes: 9 additions & 9 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/openstackclusterstackrelease_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/openstackclusterstackreleasetemplate_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/openstacknodeimagerelease_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading