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 d5ca4f924c..4335a3ca5a 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 @@ -14,10 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ +//nolint:dupl package rbac import ( + "fmt" "path/filepath" + "strings" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) @@ -30,6 +33,8 @@ type CRDEditorRole struct { machinery.MultiGroupMixin machinery.ResourceMixin machinery.ProjectNameMixin + + RoleName string } // SetTemplateDefaults implements file.Template @@ -44,6 +49,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 +76,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 233fc76330..8e4db87902 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 @@ -14,10 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ +//nolint:dupl package rbac import ( + "fmt" "path/filepath" + "strings" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) @@ -30,6 +33,8 @@ type CRDViewerRole struct { machinery.MultiGroupMixin machinery.ResourceMixin machinery.ProjectNameMixin + + RoleName string } // SetTemplateDefaults implements file.Template @@ -44,6 +49,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 +76,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 bd5635e807..1f0ac5ea74 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 4b2d523989..df850790eb 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 b78e82144a..20b491b02a 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 08c01ae981..1f42ef04e5 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 40c5d23d3b..bfa3256a50 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 8ea5332cc0..3f2ce7b5a7 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 9e7821cf8c..986f998c63 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 fdcc0f8cf6..6133770379 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 12a22f31ef..725d7fd6f5 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 de8052ce7a..e760ceab61 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 9915768283..fa3c5369f3 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 d07705c5eb..44e97a9781 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 52a5c22835..7ea815b37b 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 e4c28e5481..04fb375447 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 540cd60f0d..c7d0d5767e 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 0a3fb441bf..1b3ad9d767 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 a7fe83c260..506978a6b7 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 e3dc1d4b03..a5400bfe7e 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 6e0f8d77fe..a1c328db35 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 fc06303f36..220c3cbf99 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 558ebbd41e..004c80758a 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 6aa0a39ada..d6160fad40 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 e1d9fd5f62..2c37beb5c2 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 a3471c7a5b..bc0610123e 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 bc17d08ebf..ec070318f2 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 526df4de18..7727898a8f 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 4803040f0e..0d7d67b013 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 b38ce51f8a..c4643dcaa1 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 bf964ed914..7427f9588d 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 c0a0743fe6..a1922888d9 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 f5c7f87fd5..31b489d923 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 b0873cb68d..6e93833d3f 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 0ab6dded20..f39e048d8d 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 10c726e7ef..682f09bb9c 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 a7a5950d6d..1f7d76d728 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 3240db9b35..8eb231d9c4 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