Merge pull request #232 from maisem/strategy

Fix issue with the strategy tag not being respected.

cmd/apiregister-gen/generators/parser.go

@@ -301,9 +301,9 @@ func (b *APIsBuilder) ParseIndex() {
 
 		r.Strategy = rt.Strategy
 
-		// If not defined, default the strategy to the group strategy for backwards compatibility
+		// If not defined, default the strategy to the {{.Kind}}Strategy for backwards compatibility
 		if len(r.Strategy) == 0 {
-			r.Strategy = fmt.Sprintf("%s.%sStrategy", r.Group, r.Kind)
+			r.Strategy = fmt.Sprintf("%sStrategy", r.Kind)
 		}
 
 		// Copy the Status strategy to mirror the non-status strategy

cmd/apiregister-gen/generators/unversioned_generator.go

@@ -141,12 +141,12 @@ type {{ $s.Name }} struct {
 // {{.Kind}} Functions and Structs
 //
 // +k8s:deepcopy-gen=false
-type {{.Kind}}Strategy struct {
+type {{.Strategy}} struct {
 	builders.DefaultStorageStrategy
 }
 
 // +k8s:deepcopy-gen=false
-type {{$api.Kind}}StatusStrategy struct {
+type {{.StatusStrategy}} struct {
 	builders.DefaultStatusStorageStrategy
 }
 

cmd/apiregister-gen/generators/versioned_generator.go

@@ -144,12 +144,12 @@ type {{.Kind}}SchemeFns struct {
 }
 
 // +k8s:deepcopy-gen=false
-type {{.Kind}}Strategy struct {
+type {{.Strategy}} struct {
 	builders.DefaultStorageStrategy
 }
 
 // +k8s:deepcopy-gen=false
-type {{$api.Kind}}StatusStrategy struct {
+type {{.StatusStrategy}} struct {
 	builders.DefaultStatusStorageStrategy
 }