@@ -105,6 +105,8 @@ type RoleBinding struct {

 	RoleRef kapi.ObjectReference

 }

+type RolesByName map[string]*Role

+

 // +genclient=true

 // Policy is a object that holds all the Roles for a particular namespace.  There is at most

@@ -117,9 +119,11 @@ type Policy struct {

 	LastModified unversioned.Time

 	// Roles holds all the Roles held by this Policy, mapped by Role.Name

-	Roles map[string]*Role

+	Roles RolesByName

 }

+type RoleBindingsByName map[string]*RoleBinding

+

 // PolicyBinding is a object that holds all the RoleBindings for a particular namespace.  There is

 // one PolicyBinding document per referenced Policy namespace

 type PolicyBinding struct {

@@ -133,7 +137,7 @@ type PolicyBinding struct {

 	// PolicyRef is a reference to the Policy that contains all the Roles that this PolicyBinding's RoleBindings may reference

 	PolicyRef kapi.ObjectReference

 	// RoleBindings holds all the RoleBindings held by this PolicyBinding, mapped by RoleBinding.Name

-	RoleBindings map[string]*RoleBinding

+	RoleBindings RoleBindingsByName

 }

 // SelfSubjectRulesReview is a resource you can create to determine which actions you can perform in a namespace

@@ -331,6 +335,8 @@ type ClusterRoleBinding struct {

 	RoleRef kapi.ObjectReference

 }

+type ClusterRolesByName map[string]*ClusterRole

+

 // ClusterPolicy is a object that holds all the ClusterRoles for a particular namespace.  There is at most

 // one ClusterPolicy document per namespace.

 type ClusterPolicy struct {

@@ -342,9 +348,11 @@ type ClusterPolicy struct {

 	LastModified unversioned.Time

 	// Roles holds all the ClusterRoles held by this ClusterPolicy, mapped by Role.Name

-	Roles map[string]*ClusterRole

+	Roles ClusterRolesByName

 }

+type ClusterRoleBindingsByName map[string]*ClusterRoleBinding

+

 // ClusterPolicyBinding is a object that holds all the ClusterRoleBindings for a particular namespace.  There is

 // one ClusterPolicyBinding document per referenced ClusterPolicy namespace

 type ClusterPolicyBinding struct {

@@ -358,7 +366,7 @@ type ClusterPolicyBinding struct {

 	// ClusterPolicyRef is a reference to the ClusterPolicy that contains all the ClusterRoles that this ClusterPolicyBinding's RoleBindings may reference

 	PolicyRef kapi.ObjectReference

 	// RoleBindings holds all the RoleBindings held by this ClusterPolicyBinding, mapped by RoleBinding.Name

-	RoleBindings map[string]*ClusterRoleBinding

+	RoleBindings ClusterRoleBindingsByName

 }

 // ClusterPolicyList is a collection of ClusterPolicies

@@ -66,7 +66,6 @@ func Convert_api_ResourceAccessReviewResponse_To_v1_ResourceAccessReviewResponse

 	out.UsersSlice = in.Users.List()

 	out.GroupsSlice = in.Groups.List()

-

 	return nil

 }

@@ -112,19 +111,17 @@ func Convert_api_PolicyRule_To_v1_PolicyRule(in *newer.PolicyRule, out *PolicyRu

 }

 func Convert_v1_Policy_To_api_Policy(in *Policy, out *newer.Policy, s conversion.Scope) error {

-	out.LastModified = in.LastModified

-	out.Roles = make(map[string]*newer.Role)

-	return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

-}

-

-func Convert_api_Policy_To_v1_Policy(in *newer.Policy, out *Policy, s conversion.Scope) error {

-	out.LastModified = in.LastModified

-	out.Roles = make([]NamedRole, 0, 0)

-	return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

+	if err := autoConvert_v1_Policy_To_api_Policy(in, out, s); err != nil {

+		return err

+	}

+	if out.Roles == nil {

+		out.Roles = make(map[string]*newer.Role)

+	}

+	return nil

 }

 func Convert_v1_RoleBinding_To_api_RoleBinding(in *RoleBinding, out *newer.RoleBinding, s conversion.Scope) error {

-	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {

+	if err := autoConvert_v1_RoleBinding_To_api_RoleBinding(in, out, s); err != nil {

 		return err

 	}

@@ -139,7 +136,7 @@ func Convert_v1_RoleBinding_To_api_RoleBinding(in *RoleBinding, out *newer.RoleB

 }

 func Convert_api_RoleBinding_To_v1_RoleBinding(in *newer.RoleBinding, out *RoleBinding, s conversion.Scope) error {

-	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {

+	if err := autoConvert_api_RoleBinding_To_v1_RoleBinding(in, out, s); err != nil {

 		return err

 	}

@@ -149,32 +146,28 @@ func Convert_api_RoleBinding_To_v1_RoleBinding(in *newer.RoleBinding, out *RoleB

 }

 func Convert_v1_PolicyBinding_To_api_PolicyBinding(in *PolicyBinding, out *newer.PolicyBinding, s conversion.Scope) error {

-	out.LastModified = in.LastModified

-	out.RoleBindings = make(map[string]*newer.RoleBinding)

-	return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

-}

-

-func Convert_api_PolicyBinding_To_v1_PolicyBinding(in *newer.PolicyBinding, out *PolicyBinding, s conversion.Scope) error {

-	out.LastModified = in.LastModified

-	out.RoleBindings = make([]NamedRoleBinding, 0, 0)

-	return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

+	if err := autoConvert_v1_PolicyBinding_To_api_PolicyBinding(in, out, s); err != nil {

+		return err

+	}

+	if out.RoleBindings == nil {

+		out.RoleBindings = make(map[string]*newer.RoleBinding)

+	}

+	return nil

 }

 // and now the globals

 func Convert_v1_ClusterPolicy_To_api_ClusterPolicy(in *ClusterPolicy, out *newer.ClusterPolicy, s conversion.Scope) error {

-	out.LastModified = in.LastModified

-	out.Roles = make(map[string]*newer.ClusterRole)

-	return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

-}

-

-func Convert_api_ClusterPolicy_To_v1_ClusterPolicy(in *newer.ClusterPolicy, out *ClusterPolicy, s conversion.Scope) error {

-	out.LastModified = in.LastModified

-	out.Roles = make([]NamedClusterRole, 0, 0)

-	return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

+	if err := autoConvert_v1_ClusterPolicy_To_api_ClusterPolicy(in, out, s); err != nil {

+		return err

+	}

+	if out.Roles == nil {

+		out.Roles = make(map[string]*newer.ClusterRole)

+	}

+	return nil

 }

 func Convert_v1_ClusterRoleBinding_To_api_ClusterRoleBinding(in *ClusterRoleBinding, out *newer.ClusterRoleBinding, s conversion.Scope) error {

-	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {

+	if err := autoConvert_v1_ClusterRoleBinding_To_api_ClusterRoleBinding(in, out, s); err != nil {

 		return err

 	}

@@ -189,7 +182,7 @@ func Convert_v1_ClusterRoleBinding_To_api_ClusterRoleBinding(in *ClusterRoleBind

 }

 func Convert_api_ClusterRoleBinding_To_v1_ClusterRoleBinding(in *newer.ClusterRoleBinding, out *ClusterRoleBinding, s conversion.Scope) error {

-	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {

+	if err := autoConvert_api_ClusterRoleBinding_To_v1_ClusterRoleBinding(in, out, s); err != nil {

 		return err

 	}

@@ -199,21 +192,23 @@ func Convert_api_ClusterRoleBinding_To_v1_ClusterRoleBinding(in *newer.ClusterRo

 }

 func Convert_v1_ClusterPolicyBinding_To_api_ClusterPolicyBinding(in *ClusterPolicyBinding, out *newer.ClusterPolicyBinding, s conversion.Scope) error {

-	out.LastModified = in.LastModified

-	out.RoleBindings = make(map[string]*newer.ClusterRoleBinding)

-	return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

+	if err := autoConvert_v1_ClusterPolicyBinding_To_api_ClusterPolicyBinding(in, out, s); err != nil {

+		return err

+	}

+	if out.RoleBindings == nil {

+		out.RoleBindings = make(map[string]*newer.ClusterRoleBinding)

+	}

+	return nil

 }

-func Convert_api_ClusterPolicyBinding_To_v1_ClusterPolicyBinding(in *newer.ClusterPolicyBinding, out *ClusterPolicyBinding, s conversion.Scope) error {

-	out.LastModified = in.LastModified

-	out.RoleBindings = make([]NamedClusterRoleBinding, 0, 0)

-	return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

-}

+func Convert_v1_NamedRoles_To_api_RolesByName(in *NamedRoles, out *newer.RolesByName, s conversion.Scope) error {

+	if *out == nil {

+		*out = make(newer.RolesByName)

+	}

-func Convert_v1_NamedRoleArray_to_api_RoleArray(in *[]NamedRole, out *map[string]*newer.Role, s conversion.Scope) error {

 	for _, curr := range *in {

 		newRole := &newer.Role{}

-		if err := s.Convert(&curr.Role, newRole, 0); err != nil {

+		if err := Convert_v1_Role_To_api_Role(&curr.Role, newRole, s); err != nil {

 			return err

 		}

 		(*out)[curr.Name] = newRole

@@ -221,7 +216,7 @@ func Convert_v1_NamedRoleArray_to_api_RoleArray(in *[]NamedRole, out *map[string

 	return nil

 }

-func Convert_api_NamedRoleArray_to_v1_RoleArray(in *map[string]*newer.Role, out *[]NamedRole, s conversion.Scope) error {

+func Convert_api_RolesByName_To_v1_NamedRoles(in *newer.RolesByName, out *NamedRoles, s conversion.Scope) error {

 	allKeys := make([]string, 0, len(*in))

 	for key := range *in {

 		allKeys = append(allKeys, key)

@@ -231,7 +226,7 @@ func Convert_api_NamedRoleArray_to_v1_RoleArray(in *map[string]*newer.Role, out

 	for _, key := range allKeys {

 		newRole := (*in)[key]

 		oldRole := &Role{}

-		if err := s.Convert(newRole, oldRole, 0); err != nil {

+		if err := Convert_api_Role_To_v1_Role(newRole, oldRole, s); err != nil {

 			return err

 		}

@@ -242,10 +237,13 @@ func Convert_api_NamedRoleArray_to_v1_RoleArray(in *map[string]*newer.Role, out

 	return nil

 }

-func Convert_v1_NamedRoleBindingArray_to_api_RoleBindingArray(in *[]NamedRoleBinding, out *map[string]*newer.RoleBinding, s conversion.Scope) error {

+func Convert_v1_NamedRoleBindings_To_api_RoleBindingsByName(in *NamedRoleBindings, out *newer.RoleBindingsByName, s conversion.Scope) error {

+	if *out == nil {

+		*out = make(newer.RoleBindingsByName)

+	}

 	for _, curr := range *in {

 		newRoleBinding := &newer.RoleBinding{}

-		if err := s.Convert(&curr.RoleBinding, newRoleBinding, 0); err != nil {

+		if err := Convert_v1_RoleBinding_To_api_RoleBinding(&curr.RoleBinding, newRoleBinding, s); err != nil {

 			return err

 		}

 		(*out)[curr.Name] = newRoleBinding

@@ -253,7 +251,7 @@ func Convert_v1_NamedRoleBindingArray_to_api_RoleBindingArray(in *[]NamedRoleBin

 	return nil

 }

-func Convert_api_RoleBindingArray_to_v1_NamedRoleBindingArray(in *map[string]*newer.RoleBinding, out *[]NamedRoleBinding, s conversion.Scope) error {

+func Convert_api_RoleBindingsByName_To_v1_NamedRoleBindings(in *newer.RoleBindingsByName, out *NamedRoleBindings, s conversion.Scope) error {

 	allKeys := make([]string, 0, len(*in))

 	for key := range *in {

 		allKeys = append(allKeys, key)

@@ -263,7 +261,7 @@ func Convert_api_RoleBindingArray_to_v1_NamedRoleBindingArray(in *map[string]*ne

 	for _, key := range allKeys {

 		newRoleBinding := (*in)[key]

 		oldRoleBinding := &RoleBinding{}

-		if err := s.Convert(newRoleBinding, oldRoleBinding, 0); err != nil {

+		if err := Convert_api_RoleBinding_To_v1_RoleBinding(newRoleBinding, oldRoleBinding, s); err != nil {

 			return err

 		}

@@ -274,10 +272,13 @@ func Convert_api_RoleBindingArray_to_v1_NamedRoleBindingArray(in *map[string]*ne

 	return nil

 }

-func Convert_v1_NamedClusterRoleArray_to_api_ClusterRoleArray(in *[]NamedClusterRole, out *map[string]*newer.ClusterRole, s conversion.Scope) error {

+func Convert_v1_NamedClusterRoles_To_api_ClusterRolesByName(in *NamedClusterRoles, out *newer.ClusterRolesByName, s conversion.Scope) error {

+	if *out == nil {

+		*out = make(newer.ClusterRolesByName)

+	}

 	for _, curr := range *in {

 		newRole := &newer.ClusterRole{}

-		if err := s.Convert(&curr.Role, newRole, 0); err != nil {

+		if err := Convert_v1_ClusterRole_To_api_ClusterRole(&curr.Role, newRole, s); err != nil {

 			return err

 		}

 		(*out)[curr.Name] = newRole

@@ -285,7 +286,7 @@ func Convert_v1_NamedClusterRoleArray_to_api_ClusterRoleArray(in *[]NamedCluster

 	return nil

 }

-func Convert_api_ClusterRoleArray_to_v1_NamedClusterRoleArray(in *map[string]*newer.ClusterRole, out *[]NamedClusterRole, s conversion.Scope) error {

+func Convert_api_ClusterRolesByName_To_v1_NamedClusterRoles(in *newer.ClusterRolesByName, out *NamedClusterRoles, s conversion.Scope) error {

 	allKeys := make([]string, 0, len(*in))

 	for key := range *in {

 		allKeys = append(allKeys, key)

@@ -295,7 +296,7 @@ func Convert_api_ClusterRoleArray_to_v1_NamedClusterRoleArray(in *map[string]*ne

 	for _, key := range allKeys {

 		newRole := (*in)[key]

 		oldRole := &ClusterRole{}

-		if err := s.Convert(newRole, oldRole, 0); err != nil {

+		if err := Convert_api_ClusterRole_To_v1_ClusterRole(newRole, oldRole, s); err != nil {

 			return err

 		}

@@ -305,18 +306,20 @@ func Convert_api_ClusterRoleArray_to_v1_NamedClusterRoleArray(in *map[string]*ne

 	return nil

 }

-func Convert_v1_NamedClusterRoleBindingArray_to_ClusterRoleBindingArray(in *[]NamedClusterRoleBinding, out *map[string]*newer.ClusterRoleBinding, s conversion.Scope) error {

+func Convert_v1_NamedClusterRoleBindings_To_api_ClusterRoleBindingsByName(in *NamedClusterRoleBindings, out *newer.ClusterRoleBindingsByName, s conversion.Scope) error {

+	if *out == nil {

+		*out = make(newer.ClusterRoleBindingsByName)

+	}

 	for _, curr := range *in {

 		newRoleBinding := &newer.ClusterRoleBinding{}

-		if err := s.Convert(&curr.RoleBinding, newRoleBinding, 0); err != nil {

+		if err := Convert_v1_ClusterRoleBinding_To_api_ClusterRoleBinding(&curr.RoleBinding, newRoleBinding, s); err != nil {

 			return err

 		}

 		(*out)[curr.Name] = newRoleBinding

 	}

-

 	return nil

 }

-func Convert_api_ClusterRoleBindingArray_to_v1_NamedClusterRoleBindingArray(in *map[string]*newer.ClusterRoleBinding, out *[]NamedClusterRoleBinding, s conversion.Scope) error {

+func Convert_api_ClusterRoleBindingsByName_To_v1_NamedClusterRoleBindings(in *newer.ClusterRoleBindingsByName, out *NamedClusterRoleBindings, s conversion.Scope) error {

 	allKeys := make([]string, 0, len(*in))

 	for key := range *in {

 		allKeys = append(allKeys, key)

@@ -326,7 +329,7 @@ func Convert_api_ClusterRoleBindingArray_to_v1_NamedClusterRoleBindingArray(in *

 	for _, key := range allKeys {

 		newRoleBinding := (*in)[key]

 		oldRoleBinding := &ClusterRoleBinding{}

-		if err := s.Convert(newRoleBinding, oldRoleBinding, 0); err != nil {

+		if err := Convert_api_ClusterRoleBinding_To_v1_ClusterRoleBinding(newRoleBinding, oldRoleBinding, s); err != nil {

 			return err

 		}

@@ -339,15 +342,6 @@ func Convert_api_ClusterRoleBindingArray_to_v1_NamedClusterRoleBindingArray(in *

 func addConversionFuncs(scheme *runtime.Scheme) {

 	err := scheme.AddConversionFuncs(

-		Convert_v1_NamedRoleArray_to_api_RoleArray,

-		Convert_api_NamedRoleArray_to_v1_RoleArray,

-		Convert_v1_NamedRoleBindingArray_to_api_RoleBindingArray,

-		Convert_api_RoleBindingArray_to_v1_NamedRoleBindingArray,

-		Convert_v1_NamedClusterRoleArray_to_api_ClusterRoleArray,

-		Convert_api_ClusterRoleArray_to_v1_NamedClusterRoleArray,

-		Convert_v1_NamedClusterRoleBindingArray_to_ClusterRoleBindingArray,

-		Convert_api_ClusterRoleBindingArray_to_v1_NamedClusterRoleBindingArray,

-

 		Convert_v1_SubjectAccessReview_To_api_SubjectAccessReview,

 		Convert_api_SubjectAccessReview_To_v1_SubjectAccessReview,

 		Convert_v1_LocalSubjectAccessReview_To_api_LocalSubjectAccessReview,

@@ -62,8 +62,10 @@ type RoleBinding struct {

 	kapi.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

 	// UserNames holds all the usernames directly bound to the role

+	// +genconversion=false

 	UserNames OptionalNames `json:"userNames" protobuf:"bytes,2,rep,name=userNames"`

 	// GroupNames holds all the groups directly bound to the role

+	// +genconversion=false

 	GroupNames OptionalNames `json:"groupNames" protobuf:"bytes,3,rep,name=groupNames"`

 	// Subjects hold object references to authorize with this rule

 	Subjects []kapi.ObjectReference `json:"subjects" protobuf:"bytes,4,rep,name=subjects"`

@@ -74,6 +76,8 @@ type RoleBinding struct {

 	RoleRef kapi.ObjectReference `json:"roleRef" protobuf:"bytes,5,opt,name=roleRef"`

 }

+type NamedRoles []NamedRole

+

 // +genclient=true

 // Policy is a object that holds all the Roles for a particular namespace.  There is at most

@@ -87,9 +91,11 @@ type Policy struct {

 	LastModified unversioned.Time `json:"lastModified" protobuf:"bytes,2,opt,name=lastModified"`

 	// Roles holds all the Roles held by this Policy, mapped by Role.Name

-	Roles []NamedRole `json:"roles" protobuf:"bytes,3,rep,name=roles"`

+	Roles NamedRoles `json:"roles" protobuf:"bytes,3,rep,name=roles"`

 }

+type NamedRoleBindings []NamedRoleBinding

+

 // PolicyBinding is a object that holds all the RoleBindings for a particular namespace.  There is

 // one PolicyBinding document per referenced Policy namespace

 type PolicyBinding struct {

@@ -103,7 +109,7 @@ type PolicyBinding struct {

 	// PolicyRef is a reference to the Policy that contains all the Roles that this PolicyBinding's RoleBindings may reference

 	PolicyRef kapi.ObjectReference `json:"policyRef" protobuf:"bytes,3,opt,name=policyRef"`

 	// RoleBindings holds all the RoleBindings held by this PolicyBinding, mapped by RoleBinding.Name

-	RoleBindings []NamedRoleBinding `json:"roleBindings" protobuf:"bytes,4,rep,name=roleBindings"`

+	RoleBindings NamedRoleBindings `json:"roleBindings" protobuf:"bytes,4,rep,name=roleBindings"`

 }

 // NamedRole relates a Role with a name

@@ -314,8 +320,10 @@ type ClusterRoleBinding struct {

 	kapi.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

 	// UserNames holds all the usernames directly bound to the role

+	// +genconversion=false

 	UserNames OptionalNames `json:"userNames" protobuf:"bytes,2,rep,name=userNames"`

 	// GroupNames holds all the groups directly bound to the role

+	// +genconversion=false

 	GroupNames OptionalNames `json:"groupNames" protobuf:"bytes,3,rep,name=groupNames"`

 	// Subjects hold object references to authorize with this rule

 	Subjects []kapi.ObjectReference `json:"subjects" protobuf:"bytes,4,rep,name=subjects"`

@@ -326,6 +334,8 @@ type ClusterRoleBinding struct {

 	RoleRef kapi.ObjectReference `json:"roleRef" protobuf:"bytes,5,opt,name=roleRef"`

 }

+type NamedClusterRoles []NamedClusterRole

+

 // ClusterPolicy is a object that holds all the ClusterRoles for a particular namespace.  There is at most

 // one ClusterPolicy document per namespace.

 type ClusterPolicy struct {

@@ -337,9 +347,11 @@ type ClusterPolicy struct {

 	LastModified unversioned.Time `json:"lastModified" protobuf:"bytes,2,opt,name=lastModified"`

 	// Roles holds all the ClusterRoles held by this ClusterPolicy, mapped by ClusterRole.Name

-	Roles []NamedClusterRole `json:"roles" protobuf:"bytes,3,rep,name=roles"`

+	Roles NamedClusterRoles `json:"roles" protobuf:"bytes,3,rep,name=roles"`

 }

+type NamedClusterRoleBindings []NamedClusterRoleBinding

+

 // ClusterPolicyBinding is a object that holds all the ClusterRoleBindings for a particular namespace.  There is

 // one ClusterPolicyBinding document per referenced ClusterPolicy namespace

 type ClusterPolicyBinding struct {

@@ -353,7 +365,7 @@ type ClusterPolicyBinding struct {

 	// PolicyRef is a reference to the ClusterPolicy that contains all the ClusterRoles that this ClusterPolicyBinding's RoleBindings may reference

 	PolicyRef kapi.ObjectReference `json:"policyRef" protobuf:"bytes,3,opt,name=policyRef"`

 	// RoleBindings holds all the ClusterRoleBindings held by this ClusterPolicyBinding, mapped by ClusterRoleBinding.Name

-	RoleBindings []NamedClusterRoleBinding `json:"roleBindings" protobuf:"bytes,4,rep,name=roleBindings"`

+	RoleBindings NamedClusterRoleBindings `json:"roleBindings" protobuf:"bytes,4,rep,name=roleBindings"`

 }

 // NamedClusterRole relates a name with a cluster role

@@ -46,6 +46,7 @@ func TestClientConfigForVersion(t *testing.T) {

 			return

 		}

 		called++

+		w.Header().Set("Content-Type", "application/json")

 		w.Write([]byte(`{"versions":["v1"]}`))

 	}))

 	defer server.Close()