Merge pull request #1148 from mrajashree/backport_userattrib

[2.4] Add UserInfo field to UserAttributes

apis/management.cattle.io/v3/authn_types.go

@@ -80,6 +80,7 @@ type UserAttribute struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	UserName        string
+	UserPrincipal   Principal
 	GroupPrincipals map[string]Principals // the value is a []Principal, but code generator cannot handle slice as a value
 	LastRefresh     string
 	NeedsRefresh    bool

apis/management.cattle.io/v3/zz_generated_deepcopy.go

@@ -10063,6 +10063,7 @@ func (in *UserAttribute) DeepCopyInto(out *UserAttribute) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.UserPrincipal.DeepCopyInto(&out.UserPrincipal)
 	if in.GroupPrincipals != nil {
 		in, out := &in.GroupPrincipals, &out.GroupPrincipals
 		*out = make(map[string]Principals, len(*in))

client/management/v3/zz_generated_user_attribute.go

@@ -14,6 +14,7 @@ const (
 	UserAttributeFieldRemoved         = "removed"
 	UserAttributeFieldUUID            = "uuid"
 	UserAttributeFieldUserName        = "userName"
+	UserAttributeFieldUserPrincipal   = "userPrincipal"
 )
 
 type UserAttribute struct {
@@ -29,4 +30,5 @@ type UserAttribute struct {
 	Removed         string               `json:"removed,omitempty" yaml:"removed,omitempty"`
 	UUID            string               `json:"uuid,omitempty" yaml:"uuid,omitempty"`
 	UserName        string               `json:"userName,omitempty" yaml:"userName,omitempty"`
+	UserPrincipal   *Principal           `json:"userPrincipal,omitempty" yaml:"userPrincipal,omitempty"`
 }