Cleanup markers, ensure correct path for non GOPATH

kubernetes-sigs · May 19, 2023 · 74642c2 · 74642c2
1 parent 0648003
commit 74642c2
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/pkg/applyconfigurations/gen.go b/pkg/applyconfigurations/gen.go
@@ -37,11 +37,9 @@ import (
 // Based on deepcopy gen but with legacy marker support removed.
 
 var (
-	groupNameMarker   = markers.Must(markers.MakeDefinition("groupName", markers.DescribesPackage, ""))
-	versionNameMarker = markers.Must(markers.MakeDefinition("versionName", markers.DescribesPackage, ""))
-	isCRDMarker       = markers.Must(markers.MakeDefinition("kubebuilder:resource", markers.DescribesType, crdmarkers.Resource{}))
-	enablePkgMarker   = markers.Must(markers.MakeDefinition("kubebuilder:ac:generate", markers.DescribesPackage, false))
-	enableTypeMarker  = markers.Must(markers.MakeDefinition("kubebuilder:ac:generate", markers.DescribesType, false))
+	isCRDMarker      = markers.Must(markers.MakeDefinition("kubebuilder:resource", markers.DescribesType, crdmarkers.Resource{}))
+	enablePkgMarker  = markers.Must(markers.MakeDefinition("kubebuilder:ac:generate", markers.DescribesPackage, false))
+	enableTypeMarker = markers.Must(markers.MakeDefinition("kubebuilder:ac:generate", markers.DescribesType, false))
 )
 
 var importMapping = map[string]string{
@@ -69,14 +67,10 @@ func (Generator) CheckFilter() loader.NodeFilter {
 
 func (Generator) RegisterMarkers(into *markers.Registry) error {
 	if err := markers.RegisterAll(into,
-		groupNameMarker, versionNameMarker, isCRDMarker, enablePkgMarker, enableTypeMarker); err != nil {
+		isCRDMarker, enablePkgMarker, enableTypeMarker); err != nil {
 		return err
 	}
-	into.AddHelp(groupNameMarker,
-		markers.SimpleHelp("apply", "specifies the API group name for this package."))
 
-	into.AddHelp(versionNameMarker,
-		markers.SimpleHelp("apply", "overrides the API group version for this package (defaults to the package name)."))
 	into.AddHelp(isCRDMarker,
 		markers.SimpleHelp("apply", "enables apply configuration generation for this type"))
 	into.AddHelp(
@@ -220,6 +214,9 @@ func (ctx *ObjectGenCtx) generateForPackage(root *loader.Package) error {
 		return err
 	}
 
+	// This allows the correct output location when GOPATH is unset.
+	c.TrimPathPrefix = root.PkgPath + "/"
+
 	pkg, ok := c.Universe[root.PkgPath]
 	if !ok {
 		return fmt.Errorf("package %q not found in universe", root.Name)