From 7c82d2fe54d8dfa66d501bd55370ea12b9dfdf9c Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Fri, 5 Apr 2024 07:03:16 +0100 Subject: [PATCH] :bug: fix roles names for projects with multi-group layout --- .../templates/config/rbac/crd_editor_role.go | 17 ++++++++++++++++- .../templates/config/rbac/crd_viewer_role.go | 17 ++++++++++++++++- .../config/rbac/crew_captain_editor_role.yaml | 2 +- .../config/rbac/crew_captain_viewer_role.yaml | 2 +- .../config/rbac/fiz_bar_editor_role.yaml | 2 +- .../config/rbac/fiz_bar_viewer_role.yaml | 2 +- ...oo.policy_healthcheckpolicy_editor_role.yaml | 2 +- ...oo.policy_healthcheckpolicy_viewer_role.yaml | 2 +- .../config/rbac/foo_bar_editor_role.yaml | 2 +- .../config/rbac/foo_bar_viewer_role.yaml | 2 +- .../rbac/sea-creatures_kraken_editor_role.yaml | 2 +- .../rbac/sea-creatures_kraken_viewer_role.yaml | 2 +- .../sea-creatures_leviathan_editor_role.yaml | 2 +- .../sea-creatures_leviathan_viewer_role.yaml | 2 +- .../config/rbac/ship_cruiser_editor_role.yaml | 2 +- .../config/rbac/ship_cruiser_viewer_role.yaml | 2 +- .../config/rbac/ship_destroyer_editor_role.yaml | 2 +- .../config/rbac/ship_destroyer_viewer_role.yaml | 2 +- .../config/rbac/ship_frigate_editor_role.yaml | 2 +- .../config/rbac/ship_frigate_viewer_role.yaml | 2 +- .../config/rbac/crew_captain_editor_role.yaml | 2 +- .../config/rbac/crew_captain_viewer_role.yaml | 2 +- .../config/rbac/fiz_bar_editor_role.yaml | 2 +- .../config/rbac/fiz_bar_viewer_role.yaml | 2 +- ...oo.policy_healthcheckpolicy_editor_role.yaml | 2 +- ...oo.policy_healthcheckpolicy_viewer_role.yaml | 2 +- .../config/rbac/foo_bar_editor_role.yaml | 2 +- .../config/rbac/foo_bar_viewer_role.yaml | 2 +- .../rbac/sea-creatures_kraken_editor_role.yaml | 2 +- .../rbac/sea-creatures_kraken_viewer_role.yaml | 2 +- .../sea-creatures_leviathan_editor_role.yaml | 2 +- .../sea-creatures_leviathan_viewer_role.yaml | 2 +- .../config/rbac/ship_cruiser_editor_role.yaml | 2 +- .../config/rbac/ship_cruiser_viewer_role.yaml | 2 +- .../config/rbac/ship_destroyer_editor_role.yaml | 2 +- .../config/rbac/ship_destroyer_viewer_role.yaml | 2 +- .../config/rbac/ship_frigate_editor_role.yaml | 2 +- .../config/rbac/ship_frigate_viewer_role.yaml | 2 +- 38 files changed, 68 insertions(+), 38 deletions(-) diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_editor_role.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_editor_role.go index d5ca4f924cd..f2273cafad7 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_editor_role.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_editor_role.go @@ -17,7 +17,9 @@ limitations under the License. package rbac import ( + "fmt" "path/filepath" + "strings" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) @@ -30,6 +32,8 @@ type CRDEditorRole struct { machinery.MultiGroupMixin machinery.ResourceMixin machinery.ProjectNameMixin + + RoleName string } // SetTemplateDefaults implements file.Template @@ -44,6 +48,17 @@ func (f *CRDEditorRole) SetTemplateDefaults() error { } f.Path = f.Resource.Replacer().Replace(f.Path) + if f.RoleName == "" { + if f.MultiGroup && f.Resource.Group != "" { + f.RoleName = fmt.Sprintf("%s-%s-editor-role", + strings.ToLower(f.Resource.Group), + strings.ToLower(f.Resource.Kind)) + } else { + f.RoleName = fmt.Sprintf("%s-editor-role", + strings.ToLower(f.Resource.Kind)) + } + } + f.TemplateBody = crdRoleEditorTemplate return nil @@ -60,7 +75,7 @@ metadata: app.kubernetes.io/created-by: {{ .ProjectName }} app.kubernetes.io/part-of: {{ .ProjectName }} app.kubernetes.io/managed-by: kustomize - name: {{ lower .Resource.Kind }}-editor-role + name: {{ .RoleName }} rules: - apiGroups: - {{ .Resource.QualifiedGroup }} diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_viewer_role.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_viewer_role.go index 233fc763300..b857453e196 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_viewer_role.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_viewer_role.go @@ -17,7 +17,9 @@ limitations under the License. package rbac import ( + "fmt" "path/filepath" + "strings" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) @@ -30,6 +32,8 @@ type CRDViewerRole struct { machinery.MultiGroupMixin machinery.ResourceMixin machinery.ProjectNameMixin + + RoleName string } // SetTemplateDefaults implements file.Template @@ -44,6 +48,17 @@ func (f *CRDViewerRole) SetTemplateDefaults() error { } f.Path = f.Resource.Replacer().Replace(f.Path) + if f.RoleName == "" { + if f.MultiGroup && f.Resource.Group != "" { + f.RoleName = fmt.Sprintf("%s-%s-viewer-role", + strings.ToLower(f.Resource.Group), + strings.ToLower(f.Resource.Kind)) + } else { + f.RoleName = fmt.Sprintf("%s-viewer-role", + strings.ToLower(f.Resource.Kind)) + } + } + f.TemplateBody = crdRoleViewerTemplate return nil @@ -60,7 +75,7 @@ metadata: app.kubernetes.io/created-by: {{ .ProjectName }} app.kubernetes.io/part-of: {{ .ProjectName }} app.kubernetes.io/managed-by: kustomize - name: {{ lower .Resource.Kind }}-viewer-role + name: {{ .RoleName }} rules: - apiGroups: - {{ .Resource.QualifiedGroup }} diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/crew_captain_editor_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/crew_captain_editor_role.yaml index bd5635e807a..1f0ac5ea74b 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/crew_captain_editor_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/crew_captain_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: captain-editor-role + name: crew-captain-editor-role rules: - apiGroups: - crew.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/crew_captain_viewer_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/crew_captain_viewer_role.yaml index 4b2d5239891..df850790ebd 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/crew_captain_viewer_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/crew_captain_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: captain-viewer-role + name: crew-captain-viewer-role rules: - apiGroups: - crew.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/fiz_bar_editor_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/fiz_bar_editor_role.yaml index b78e82144a5..20b491b02a2 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/fiz_bar_editor_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/fiz_bar_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: bar-editor-role + name: fiz-bar-editor-role rules: - apiGroups: - fiz.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/fiz_bar_viewer_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/fiz_bar_viewer_role.yaml index 08c01ae9813..1f42ef04e5f 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/fiz_bar_viewer_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/fiz_bar_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: bar-viewer-role + name: fiz-bar-viewer-role rules: - apiGroups: - fiz.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml index 40c5d23d3ba..bfa3256a50b 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: healthcheckpolicy-editor-role + name: foo.policy-healthcheckpolicy-editor-role rules: - apiGroups: - foo.policy.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml index 8ea5332cc09..3f2ce7b5a7b 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: healthcheckpolicy-viewer-role + name: foo.policy-healthcheckpolicy-viewer-role rules: - apiGroups: - foo.policy.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo_bar_editor_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo_bar_editor_role.yaml index 9e7821cf8c4..986f998c639 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo_bar_editor_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo_bar_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: bar-editor-role + name: foo-bar-editor-role rules: - apiGroups: - foo.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo_bar_viewer_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo_bar_viewer_role.yaml index fdcc0f8cf60..6133770379e 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo_bar_viewer_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/foo_bar_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: bar-viewer-role + name: foo-bar-viewer-role rules: - apiGroups: - foo.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_kraken_editor_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_kraken_editor_role.yaml index 12a22f31ef8..725d7fd6f59 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_kraken_editor_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_kraken_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: kraken-editor-role + name: sea-creatures-kraken-editor-role rules: - apiGroups: - sea-creatures.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_kraken_viewer_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_kraken_viewer_role.yaml index de8052ce7a4..e760ceab618 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_kraken_viewer_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_kraken_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: kraken-viewer-role + name: sea-creatures-kraken-viewer-role rules: - apiGroups: - sea-creatures.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_leviathan_editor_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_leviathan_editor_role.yaml index 9915768283d..fa3c5369f38 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_leviathan_editor_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_leviathan_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: leviathan-editor-role + name: sea-creatures-leviathan-editor-role rules: - apiGroups: - sea-creatures.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_leviathan_viewer_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_leviathan_viewer_role.yaml index d07705c5eb3..44e97a9781a 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_leviathan_viewer_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/sea-creatures_leviathan_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: leviathan-viewer-role + name: sea-creatures-leviathan-viewer-role rules: - apiGroups: - sea-creatures.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_cruiser_editor_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_cruiser_editor_role.yaml index 52a5c228354..7ea815b37b0 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_cruiser_editor_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_cruiser_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: cruiser-editor-role + name: ship-cruiser-editor-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_cruiser_viewer_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_cruiser_viewer_role.yaml index e4c28e54811..04fb3754475 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_cruiser_viewer_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_cruiser_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: cruiser-viewer-role + name: ship-cruiser-viewer-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_destroyer_editor_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_destroyer_editor_role.yaml index 540cd60f0d0..c7d0d5767e2 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_destroyer_editor_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_destroyer_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: destroyer-editor-role + name: ship-destroyer-editor-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_destroyer_viewer_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_destroyer_viewer_role.yaml index 0a3fb441bfd..1b3ad9d7672 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_destroyer_viewer_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_destroyer_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: destroyer-viewer-role + name: ship-destroyer-viewer-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_frigate_editor_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_frigate_editor_role.yaml index a7fe83c260d..506978a6b79 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_frigate_editor_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_frigate_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: frigate-editor-role + name: ship-frigate-editor-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_frigate_viewer_role.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_frigate_viewer_role.yaml index e3dc1d4b033..a5400bfe7ea 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_frigate_viewer_role.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/ship_frigate_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - name: frigate-viewer-role + name: ship-frigate-viewer-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/crew_captain_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/crew_captain_editor_role.yaml index 6e0f8d77fe9..a1c328db350 100644 --- a/testdata/project-v4-multigroup/config/rbac/crew_captain_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/crew_captain_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: captain-editor-role + name: crew-captain-editor-role rules: - apiGroups: - crew.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/crew_captain_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/crew_captain_viewer_role.yaml index fc06303f36b..220c3cbf99c 100644 --- a/testdata/project-v4-multigroup/config/rbac/crew_captain_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/crew_captain_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: captain-viewer-role + name: crew-captain-viewer-role rules: - apiGroups: - crew.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/fiz_bar_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/fiz_bar_editor_role.yaml index 558ebbd41ec..004c80758a8 100644 --- a/testdata/project-v4-multigroup/config/rbac/fiz_bar_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/fiz_bar_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: bar-editor-role + name: fiz-bar-editor-role rules: - apiGroups: - fiz.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/fiz_bar_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/fiz_bar_viewer_role.yaml index 6aa0a39ada0..d6160fad409 100644 --- a/testdata/project-v4-multigroup/config/rbac/fiz_bar_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/fiz_bar_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: bar-viewer-role + name: fiz-bar-viewer-role rules: - apiGroups: - fiz.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml index e1d9fd5f62c..2c37beb5c2b 100644 --- a/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: healthcheckpolicy-editor-role + name: foo.policy-healthcheckpolicy-editor-role rules: - apiGroups: - foo.policy.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml index a3471c7a5bb..bc0610123ee 100644 --- a/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: healthcheckpolicy-viewer-role + name: foo.policy-healthcheckpolicy-viewer-role rules: - apiGroups: - foo.policy.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/foo_bar_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/foo_bar_editor_role.yaml index bc17d08ebfc..ec070318f27 100644 --- a/testdata/project-v4-multigroup/config/rbac/foo_bar_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/foo_bar_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: bar-editor-role + name: foo-bar-editor-role rules: - apiGroups: - foo.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/foo_bar_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/foo_bar_viewer_role.yaml index 526df4de18c..7727898a8f6 100644 --- a/testdata/project-v4-multigroup/config/rbac/foo_bar_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/foo_bar_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: bar-viewer-role + name: foo-bar-viewer-role rules: - apiGroups: - foo.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_editor_role.yaml index 4803040f0e7..0d7d67b0137 100644 --- a/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: kraken-editor-role + name: sea-creatures-kraken-editor-role rules: - apiGroups: - sea-creatures.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_viewer_role.yaml index b38ce51f8a8..c4643dcaa1e 100644 --- a/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: kraken-viewer-role + name: sea-creatures-kraken-viewer-role rules: - apiGroups: - sea-creatures.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_editor_role.yaml index bf964ed9148..7427f9588de 100644 --- a/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: leviathan-editor-role + name: sea-creatures-leviathan-editor-role rules: - apiGroups: - sea-creatures.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_viewer_role.yaml index c0a0743fe65..a1922888d9c 100644 --- a/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: leviathan-viewer-role + name: sea-creatures-leviathan-viewer-role rules: - apiGroups: - sea-creatures.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/ship_cruiser_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_cruiser_editor_role.yaml index f5c7f87fd5d..31b489d923c 100644 --- a/testdata/project-v4-multigroup/config/rbac/ship_cruiser_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_cruiser_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: cruiser-editor-role + name: ship-cruiser-editor-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/ship_cruiser_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_cruiser_viewer_role.yaml index b0873cb68d9..6e93833d3f5 100644 --- a/testdata/project-v4-multigroup/config/rbac/ship_cruiser_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_cruiser_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: cruiser-viewer-role + name: ship-cruiser-viewer-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/ship_destroyer_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_destroyer_editor_role.yaml index 0ab6dded209..f39e048d8d5 100644 --- a/testdata/project-v4-multigroup/config/rbac/ship_destroyer_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_destroyer_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: destroyer-editor-role + name: ship-destroyer-editor-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/ship_destroyer_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_destroyer_viewer_role.yaml index 10c726e7ef9..682f09bb9c1 100644 --- a/testdata/project-v4-multigroup/config/rbac/ship_destroyer_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_destroyer_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: destroyer-viewer-role + name: ship-destroyer-viewer-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/ship_frigate_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_frigate_editor_role.yaml index a7a5950d6d5..1f7d76d728e 100644 --- a/testdata/project-v4-multigroup/config/rbac/ship_frigate_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_frigate_editor_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: frigate-editor-role + name: ship-frigate-editor-role rules: - apiGroups: - ship.testproject.org diff --git a/testdata/project-v4-multigroup/config/rbac/ship_frigate_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_frigate_viewer_role.yaml index 3240db9b358..8eb231d9c45 100644 --- a/testdata/project-v4-multigroup/config/rbac/ship_frigate_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_frigate_viewer_role.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - name: frigate-viewer-role + name: ship-frigate-viewer-role rules: - apiGroups: - ship.testproject.org