include group name in crd patches and rbac editor/viewer files

kubernetes-sigs · Jan 30, 2022 · 695795e · 695795e
1 parent e395f98
commit 695795e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...n/kustomize/v1/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go b/...n/kustomize/v1/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go
@@ -33,7 +33,7 @@ type EnableCAInjectionPatch struct {
 // SetTemplateDefaults implements file.Template
 func (f *EnableCAInjectionPatch) SetTemplateDefaults() error {
 	if f.Path == "" {
-		f.Path = filepath.Join("config", "crd", "patches", "cainjection_in_%[plural].yaml")
+		f.Path = filepath.Join("config", "crd", "patches", "cainjection_in_%[group]_%[plural].yaml")
 	}
 	f.Path = f.Resource.Replacer().Replace(f.Path)
 

diff --git a/...ommon/kustomize/v1/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go b/...ommon/kustomize/v1/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go
@@ -33,7 +33,7 @@ type EnableWebhookPatch struct {
 // SetTemplateDefaults implements file.Template
 func (f *EnableWebhookPatch) SetTemplateDefaults() error {
 	if f.Path == "" {
-		f.Path = filepath.Join("config", "crd", "patches", "webhook_in_%[plural].yaml")
+		f.Path = filepath.Join("config", "crd", "patches", "webhook_in_%[group]_%[plural].yaml")
 	}
 	f.Path = f.Resource.Replacer().Replace(f.Path)
 

diff --git a/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/rbac/crd_editor_role.go b/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/rbac/crd_editor_role.go
@@ -33,7 +33,7 @@ type CRDEditorRole struct {
 // SetTemplateDefaults implements file.Template
 func (f *CRDEditorRole) SetTemplateDefaults() error {
 	if f.Path == "" {
-		f.Path = filepath.Join("config", "rbac", "%[kind]_editor_role.yaml")
+		f.Path = filepath.Join("config", "rbac", "%[group]_%[kind]_editor_role.yaml")
 	}
 	f.Path = f.Resource.Replacer().Replace(f.Path)
 

diff --git a/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/rbac/crd_viewer_role.go b/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/rbac/crd_viewer_role.go
@@ -33,7 +33,7 @@ type CRDViewerRole struct {
 // SetTemplateDefaults implements file.Template
 func (f *CRDViewerRole) SetTemplateDefaults() error {
 	if f.Path == "" {
-		f.Path = filepath.Join("config", "rbac", "%[kind]_viewer_role.yaml")
+		f.Path = filepath.Join("config", "rbac", "%[group]_%[kind]_viewer_role.yaml")
 	}
 	f.Path = f.Resource.Replacer().Replace(f.Path)