Merge pull request #3837 from camilamacedo86/fix-path-core-types

🐛 fix resource path generation for resources without a specified group
kubernetes-sigs · Apr 1, 2024 · 777f588 · 777f588
2 parents f3159c6 + d93a1ca
commit 777f588
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 14 deletions.
diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go
@@ -85,7 +85,7 @@ func (f *Kustomization) GetCodeFragments() machinery.CodeFragmentsMap {
 	res = append(res, fmt.Sprintf(resourceCodeFragment, f.Resource.QualifiedGroup(), f.Resource.Plural))
 
 	suffix := f.Resource.Plural
-	if f.MultiGroup {
+	if f.MultiGroup && f.Resource.Group != "" {
 		suffix = f.Resource.Group + "_" + f.Resource.Plural
 	}
 	// Generate resource code fragments

diff --git a/...n/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go b/...n/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go
@@ -34,7 +34,7 @@ type EnableCAInjectionPatch struct {
 // SetTemplateDefaults implements file.Template
 func (f *EnableCAInjectionPatch) SetTemplateDefaults() error {
 	if f.Path == "" {
-		if f.MultiGroup {
+		if f.MultiGroup && f.Resource.Group != "" {
 			f.Path = filepath.Join("config", "crd", "patches", "cainjection_in_%[group]_%[plural].yaml")
 		} else {
 			f.Path = filepath.Join("config", "crd", "patches", "cainjection_in_%[plural].yaml")

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

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
@@ -35,7 +35,7 @@ type CRDEditorRole struct {
 // SetTemplateDefaults implements file.Template
 func (f *CRDEditorRole) SetTemplateDefaults() error {
 	if f.Path == "" {
-		if f.MultiGroup {
+		if f.MultiGroup && f.Resource.Group != "" {
 			f.Path = filepath.Join("config", "rbac", "%[group]_%[kind]_editor_role.yaml")
 		} else {
 			f.Path = filepath.Join("config", "rbac", "%[kind]_editor_role.yaml")

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
@@ -35,7 +35,7 @@ type CRDViewerRole struct {
 // SetTemplateDefaults implements file.Template
 func (f *CRDViewerRole) SetTemplateDefaults() error {
 	if f.Path == "" {
-		if f.MultiGroup {
+		if f.MultiGroup && f.Resource.Group != "" {
 			f.Path = filepath.Join("config", "rbac", "%[group]_%[kind]_viewer_role.yaml")
 		} else {
 			f.Path = filepath.Join("config", "rbac", "%[kind]_viewer_role.yaml")

diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go
@@ -36,7 +36,11 @@ type CRDSample struct {
 // SetTemplateDefaults implements file.Template
 func (f *CRDSample) SetTemplateDefaults() error {
 	if f.Path == "" {
-		f.Path = filepath.Join("config", "samples", "%[group]_%[version]_%[kind].yaml")
+		if f.Resource.Group != "" {
+			f.Path = filepath.Join("config", "samples", "%[group]_%[version]_%[kind].yaml")
+		} else {
+			f.Path = filepath.Join("config", "samples", "%[version]_%[kind].yaml")
+		}
 	}
 	f.Path = f.Resource.Replacer().Replace(f.Path)
 

diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/kustomization.go
@@ -59,7 +59,11 @@ const samplesCodeFragment = `- %s
 // makeCRFileName returns a Custom Resource example file name in the same format
 // as kubebuilder's CreateAPI plugin for a gvk.
 func (f Kustomization) makeCRFileName() string {
-	return f.Resource.Replacer().Replace("%[group]_%[version]_%[kind].yaml")
+	if f.Resource.Group != "" {
+		return f.Resource.Replacer().Replace("%[group]_%[version]_%[kind].yaml")
+	}
+	return f.Resource.Replacer().Replace("%[version]_%[kind].yaml")
+
 }
 
 // GetCodeFragments implements file.Inserter

diff --git a/...ns/golang/deploy-image/v1alpha1/scaffolds/internal/templates/config/samples/crd_sample.go b/...ns/golang/deploy-image/v1alpha1/scaffolds/internal/templates/config/samples/crd_sample.go
@@ -35,7 +35,11 @@ type CRDSample struct {
 // SetTemplateDefaults implements file.Template
 func (f *CRDSample) SetTemplateDefaults() error {
 	if f.Path == "" {
-		f.Path = filepath.Join("config", "samples", "%[group]_%[version]_%[kind].yaml")
+		if f.Resource.Group != "" {
+			f.Path = filepath.Join("config", "samples", "%[group]_%[version]_%[kind].yaml")
+		} else {
+			f.Path = filepath.Join("config", "samples", "%[version]_%[kind].yaml")
+		}
 	}
 	f.Path = f.Resource.Replacer().Replace(f.Path)
 	log.Println(f.Path)

diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/crd/kustomization.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/crd/kustomization.yaml
@@ -26,7 +26,7 @@ patches:
 #- path: patches/webhook_in_foo.policy_healthcheckpolicies.yaml
 #- path: patches/webhook_in_foo_bars.yaml
 #- path: patches/webhook_in_fiz_bars.yaml
-#- path: patches/webhook_in__lakers.yaml
+#- path: patches/webhook_in_lakers.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
@@ -40,7 +40,7 @@ patches:
 #- path: patches/cainjection_in_foo.policy_healthcheckpolicies.yaml
 #- path: patches/cainjection_in_foo_bars.yaml
 #- path: patches/cainjection_in_fiz_bars.yaml
-#- path: patches/cainjection_in__lakers.yaml
+#- path: patches/cainjection_in_lakers.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # [WEBHOOK] To enable webhook, uncomment the following section

diff --git a/...g/crd/patches/cainjection_in__lakers.yaml → ...ig/crd/patches/cainjection_in_lakers.yaml b/...g/crd/patches/cainjection_in__lakers.yaml → ...ig/crd/patches/cainjection_in_lakers.yaml
diff --git a/...onfig/crd/patches/webhook_in__lakers.yaml → ...config/crd/patches/webhook_in_lakers.yaml b/...onfig/crd/patches/webhook_in__lakers.yaml → ...config/crd/patches/webhook_in_lakers.yaml
diff --git a/...mage/config/rbac/_lakers_editor_role.yaml → ...image/config/rbac/lakers_editor_role.yaml b/...mage/config/rbac/_lakers_editor_role.yaml → ...image/config/rbac/lakers_editor_role.yaml
diff --git a/...mage/config/rbac/_lakers_viewer_role.yaml → ...image/config/rbac/lakers_viewer_role.yaml b/...mage/config/rbac/_lakers_viewer_role.yaml → ...image/config/rbac/lakers_viewer_role.yaml
diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/kustomization.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/kustomization.yaml
@@ -9,5 +9,5 @@ resources:
 - foo.policy_v1_healthcheckpolicy.yaml
 - foo_v1_bar.yaml
 - fiz_v1_bar.yaml
-- _v1_lakers.yaml
+- v1_lakers.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples
diff --git a/...ploy-image/config/samples/_v1_lakers.yaml → ...eploy-image/config/samples/v1_lakers.yaml b/...ploy-image/config/samples/_v1_lakers.yaml → ...eploy-image/config/samples/v1_lakers.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/kustomization.yaml b/testdata/project-v4-multigroup/config/crd/kustomization.yaml
@@ -26,7 +26,7 @@ patches:
 #- path: patches/webhook_in_foo.policy_healthcheckpolicies.yaml
 #- path: patches/webhook_in_foo_bars.yaml
 #- path: patches/webhook_in_fiz_bars.yaml
-#- path: patches/webhook_in__lakers.yaml
+#- path: patches/webhook_in_lakers.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
@@ -40,7 +40,7 @@ patches:
 #- path: patches/cainjection_in_foo.policy_healthcheckpolicies.yaml
 #- path: patches/cainjection_in_foo_bars.yaml
 #- path: patches/cainjection_in_fiz_bars.yaml
-#- path: patches/cainjection_in__lakers.yaml
+#- path: patches/cainjection_in_lakers.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # [WEBHOOK] To enable webhook, uncomment the following section

diff --git a/...g/crd/patches/cainjection_in__lakers.yaml → ...ig/crd/patches/cainjection_in_lakers.yaml b/...g/crd/patches/cainjection_in__lakers.yaml → ...ig/crd/patches/cainjection_in_lakers.yaml
diff --git a/...onfig/crd/patches/webhook_in__lakers.yaml → ...config/crd/patches/webhook_in_lakers.yaml b/...onfig/crd/patches/webhook_in__lakers.yaml → ...config/crd/patches/webhook_in_lakers.yaml
diff --git a/...roup/config/rbac/_lakers_editor_role.yaml → ...group/config/rbac/lakers_editor_role.yaml b/...roup/config/rbac/_lakers_editor_role.yaml → ...group/config/rbac/lakers_editor_role.yaml
diff --git a/...roup/config/rbac/_lakers_viewer_role.yaml → ...group/config/rbac/lakers_viewer_role.yaml b/...roup/config/rbac/_lakers_viewer_role.yaml → ...group/config/rbac/lakers_viewer_role.yaml
diff --git a/testdata/project-v4-multigroup/config/samples/kustomization.yaml b/testdata/project-v4-multigroup/config/samples/kustomization.yaml
@@ -9,5 +9,5 @@ resources:
 - foo.policy_v1_healthcheckpolicy.yaml
 - foo_v1_bar.yaml
 - fiz_v1_bar.yaml
-- _v1_lakers.yaml
+- v1_lakers.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples
diff --git a/...multigroup/config/samples/_v1_lakers.yaml → ...-multigroup/config/samples/v1_lakers.yaml b/...multigroup/config/samples/_v1_lakers.yaml → ...-multigroup/config/samples/v1_lakers.yaml