UPSTREAM: <carry>: update clientset generator for openshift groups

:100644 100644 e0d958fbf6... 8239bd5ea1... M	cmd/client-gen/generators/client_generator.go
:100644 100644 4054b577d4... f2e64d6c44... M	cmd/informer-gen/generators/generic.go
:100644 100644 593e56a2b5... 949fe74215... M	cmd/informer-gen/generators/packages.go
:100644 100644 9466e3cb07... 65e5ed6a59... M	cmd/lister-gen/generators/lister.go

Author: mfojtik

Diff for: cmd/client-gen/generators/client_generator.go

@@ -39,16 +39,29 @@ import (
 // NameSystems returns the name system used by the generators in this package.
 func NameSystems() namer.NameSystems {
 	pluralExceptions := map[string]string{
-		"Endpoints": "Endpoints",
+		"Endpoints":                  "Endpoints",
+		"SecurityContextConstraints": "SecurityContextConstraints",
 	}
 	lowercaseNamer := namer.NewAllLowercasePluralNamer(pluralExceptions)
 
 	publicNamer := &ExceptionNamer{
 		Exceptions: map[string]string{
-		// these exceptions are used to deconflict the generated code
-		// you can put your fully qualified package like
-		// to generate a name that doesn't conflict with your group.
-		// "k8s.io/apis/events/v1alpha1.Event": "EventResource"
+			// these exceptions are used to deconflict the generated code
+			// you can put your fully qualified package like
+			// to generate a name that doesn't conflict with your group.
+			// "k8s.io/apis/events/v1alpha1.Event": "EventResource"
+			"github.com/openshift/origin/pkg/build/apis/build/v1.Build":          "BuildResource",
+			"github.com/openshift/origin/pkg/build/apis/build.Build":             "BuildResource",
+			"github.com/openshift/origin/pkg/image/apis/image/v1.Image":          "ImageResource",
+			"github.com/openshift/origin/pkg/image/apis/image.Image":             "ImageResource",
+			"github.com/openshift/origin/pkg/project/apis/project/v1.Project":    "ProjectResource",
+			"github.com/openshift/origin/pkg/project/apis/project.Project":       "ProjectResource",
+			"github.com/openshift/origin/pkg/route/apis/route/v1.Route":          "RouteResource",
+			"github.com/openshift/origin/pkg/route/apis/route.Route":             "RouteResource",
+			"github.com/openshift/origin/pkg/template/apis/template/v1.Template": "TemplateResource",
+			"github.com/openshift/origin/pkg/template/apis/template.Template":    "TemplateResource",
+			"github.com/openshift/origin/pkg/user/apis/user/v1.User":             "UserResource",
+			"github.com/openshift/origin/pkg/user/apis/user.User":                "UserResource",
 		},
 		KeyFunc: func(t *types.Type) string {
 			return t.Name.Package + "." + t.Name.Name
@@ -57,10 +70,22 @@ func NameSystems() namer.NameSystems {
 	}
 	privateNamer := &ExceptionNamer{
 		Exceptions: map[string]string{
-		// these exceptions are used to deconflict the generated code
-		// you can put your fully qualified package like
-		// to generate a name that doesn't conflict with your group.
-		// "k8s.io/apis/events/v1alpha1.Event": "eventResource"
+			// these exceptions are used to deconflict the generated code
+			// you can put your fully qualified package like
+			// to generate a name that doesn't conflict with your group.
+			// "k8s.io/apis/events/v1alpha1.Event": "eventResource"
+			"github.com/openshift/origin/pkg/build/apis/build/v1.Build":          "buildResource",
+			"github.com/openshift/origin/pkg/build/apis/build.Build":             "buildResource",
+			"github.com/openshift/origin/pkg/image/apis/image/v1.Image":          "imageResource",
+			"github.com/openshift/origin/pkg/image/apis/image.Image":             "imageResource",
+			"github.com/openshift/origin/pkg/project/apis/project/v1.Project":    "projectResource",
+			"github.com/openshift/origin/pkg/project/apis/project.Project":       "projectResource",
+			"github.com/openshift/origin/pkg/route/apis/route/v1.Route":          "routeResource",
+			"github.com/openshift/origin/pkg/route/apis/route.Route":             "routeResource",
+			"github.com/openshift/origin/pkg/template/apis/template/v1.Template": "templateResource",
+			"github.com/openshift/origin/pkg/template/apis/template.Template":    "templateResource",
+			"github.com/openshift/origin/pkg/user/apis/user/v1.User":             "userResource",
+			"github.com/openshift/origin/pkg/user/apis/user.User":                "userResource",
 		},
 		KeyFunc: func(t *types.Type) string {
 			return t.Name.Package + "." + t.Name.Name

Diff for: cmd/informer-gen/generators/generic.go

@@ -49,7 +49,8 @@ func (g *genericGenerator) Filter(c *generator.Context, t *types.Type) bool {
 
 func (g *genericGenerator) Namers(c *generator.Context) namer.NameSystems {
 	pluralExceptions := map[string]string{
-		"Endpoints": "Endpoints",
+		"Endpoints":                  "Endpoints",
+		"SecurityContextConstraints": "SecurityContextConstraints",
 	}
 	return namer.NameSystems{
 		"raw":                namer.NewRawNamer(g.outputPackage, g.imports),

Diff for: cmd/informer-gen/generators/packages.go

@@ -35,7 +35,8 @@ import (
 // NameSystems returns the name system used by the generators in this package.
 func NameSystems() namer.NameSystems {
 	pluralExceptions := map[string]string{
-		"Endpoints": "Endpoints",
+		"Endpoints":                  "Endpoints",
+		"SecurityContextConstraints": "SecurityContextConstraints",
 	}
 	return namer.NameSystems{
 		"public":             namer.NewPublicNamer(0),

Diff for: cmd/lister-gen/generators/lister.go

@@ -36,7 +36,8 @@ import (
 // NameSystems returns the name system used by the generators in this package.
 func NameSystems() namer.NameSystems {
 	pluralExceptions := map[string]string{
-		"Endpoints": "Endpoints",
+		"Endpoints":                  "Endpoints",
+		"SecurityContextConstraints": "SecurityContextConstraints",
 	}
 	return namer.NameSystems{
 		"public":             namer.NewPublicNamer(0),