diff --git a/apis/management.cattle.io/v3/authn_types.go b/apis/management.cattle.io/v3/authn_types.go index c5f771f1bc..fc733e4806 100644 --- a/apis/management.cattle.io/v3/authn_types.go +++ b/apis/management.cattle.io/v3/authn_types.go @@ -262,6 +262,7 @@ type LdapConfig struct { UserDisabledBitMask int64 `json:"userDisabledBitMask,omitempty"` UserSearchBase string `json:"userSearchBase,omitempty" norman:"notnullable,required"` UserSearchAttribute string `json:"userSearchAttribute,omitempty" norman:"default=uid|sn|givenName,notnullable,required"` + UserSearchFilter string `json:"userSearchFilter,omitempty"` UserLoginAttribute string `json:"userLoginAttribute,omitempty" norman:"default=uid,notnullable,required"` UserObjectClass string `json:"userObjectClass,omitempty" norman:"default=inetOrgPerson,notnullable,required"` UserNameAttribute string `json:"userNameAttribute,omitempty" norman:"default=cn,notnullable,required"` @@ -269,6 +270,7 @@ type LdapConfig struct { UserEnabledAttribute string `json:"userEnabledAttribute,omitempty"` GroupSearchBase string `json:"groupSearchBase,omitempty"` GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" norman:"default=cn,notnullable,required"` + GroupSearchFilter string `json:"groupSearchFilter,omitempty"` GroupObjectClass string `json:"groupObjectClass,omitempty" norman:"default=groupOfNames,notnullable,required"` GroupNameAttribute string `json:"groupNameAttribute,omitempty" norman:"default=cn,notnullable,required"` GroupDNAttribute string `json:"groupDNAttribute,omitempty" norman:"default=entryDN,notnullable"` diff --git a/client/management/v3/zz_generated_free_ipa_config.go b/client/management/v3/zz_generated_free_ipa_config.go index 5430f5febe..9c23de3405 100644 --- a/client/management/v3/zz_generated_free_ipa_config.go +++ b/client/management/v3/zz_generated_free_ipa_config.go @@ -17,6 +17,7 @@ const ( FreeIpaConfigFieldGroupObjectClass = "groupObjectClass" FreeIpaConfigFieldGroupSearchAttribute = "groupSearchAttribute" FreeIpaConfigFieldGroupSearchBase = "groupSearchBase" + FreeIpaConfigFieldGroupSearchFilter = "groupSearchFilter" FreeIpaConfigFieldLabels = "labels" FreeIpaConfigFieldName = "name" FreeIpaConfigFieldOwnerReferences = "ownerReferences" @@ -36,6 +37,7 @@ const ( FreeIpaConfigFieldUserObjectClass = "userObjectClass" FreeIpaConfigFieldUserSearchAttribute = "userSearchAttribute" FreeIpaConfigFieldUserSearchBase = "userSearchBase" + FreeIpaConfigFieldUserSearchFilter = "userSearchFilter" ) type FreeIpaConfig struct { @@ -54,6 +56,7 @@ type FreeIpaConfig struct { GroupObjectClass string `json:"groupObjectClass,omitempty" yaml:"groupObjectClass,omitempty"` GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" yaml:"groupSearchAttribute,omitempty"` GroupSearchBase string `json:"groupSearchBase,omitempty" yaml:"groupSearchBase,omitempty"` + GroupSearchFilter string `json:"groupSearchFilter,omitempty" yaml:"groupSearchFilter,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` @@ -73,4 +76,5 @@ type FreeIpaConfig struct { UserObjectClass string `json:"userObjectClass,omitempty" yaml:"userObjectClass,omitempty"` UserSearchAttribute string `json:"userSearchAttribute,omitempty" yaml:"userSearchAttribute,omitempty"` UserSearchBase string `json:"userSearchBase,omitempty" yaml:"userSearchBase,omitempty"` + UserSearchFilter string `json:"userSearchFilter,omitempty" yaml:"userSearchFilter,omitempty"` } diff --git a/client/management/v3/zz_generated_ldap_config.go b/client/management/v3/zz_generated_ldap_config.go index 38493840ca..acdfe96c8f 100644 --- a/client/management/v3/zz_generated_ldap_config.go +++ b/client/management/v3/zz_generated_ldap_config.go @@ -21,6 +21,7 @@ const ( LdapConfigFieldGroupObjectClass = "groupObjectClass" LdapConfigFieldGroupSearchAttribute = "groupSearchAttribute" LdapConfigFieldGroupSearchBase = "groupSearchBase" + LdapConfigFieldGroupSearchFilter = "groupSearchFilter" LdapConfigFieldLabels = "labels" LdapConfigFieldName = "name" LdapConfigFieldNestedGroupMembershipEnabled = "nestedGroupMembershipEnabled" @@ -41,6 +42,7 @@ const ( LdapConfigFieldUserObjectClass = "userObjectClass" LdapConfigFieldUserSearchAttribute = "userSearchAttribute" LdapConfigFieldUserSearchBase = "userSearchBase" + LdapConfigFieldUserSearchFilter = "userSearchFilter" ) type LdapConfig struct { @@ -60,6 +62,7 @@ type LdapConfig struct { GroupObjectClass string `json:"groupObjectClass,omitempty" yaml:"groupObjectClass,omitempty"` GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" yaml:"groupSearchAttribute,omitempty"` GroupSearchBase string `json:"groupSearchBase,omitempty" yaml:"groupSearchBase,omitempty"` + GroupSearchFilter string `json:"groupSearchFilter,omitempty" yaml:"groupSearchFilter,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` NestedGroupMembershipEnabled bool `json:"nestedGroupMembershipEnabled,omitempty" yaml:"nestedGroupMembershipEnabled,omitempty"` @@ -80,6 +83,7 @@ type LdapConfig struct { UserObjectClass string `json:"userObjectClass,omitempty" yaml:"userObjectClass,omitempty"` UserSearchAttribute string `json:"userSearchAttribute,omitempty" yaml:"userSearchAttribute,omitempty"` UserSearchBase string `json:"userSearchBase,omitempty" yaml:"userSearchBase,omitempty"` + UserSearchFilter string `json:"userSearchFilter,omitempty" yaml:"userSearchFilter,omitempty"` } type LdapConfigCollection struct { diff --git a/client/management/v3/zz_generated_open_ldap_config.go b/client/management/v3/zz_generated_open_ldap_config.go index fa30292e1e..aec36df0cd 100644 --- a/client/management/v3/zz_generated_open_ldap_config.go +++ b/client/management/v3/zz_generated_open_ldap_config.go @@ -17,6 +17,7 @@ const ( OpenLdapConfigFieldGroupObjectClass = "groupObjectClass" OpenLdapConfigFieldGroupSearchAttribute = "groupSearchAttribute" OpenLdapConfigFieldGroupSearchBase = "groupSearchBase" + OpenLdapConfigFieldGroupSearchFilter = "groupSearchFilter" OpenLdapConfigFieldLabels = "labels" OpenLdapConfigFieldName = "name" OpenLdapConfigFieldNestedGroupMembershipEnabled = "nestedGroupMembershipEnabled" @@ -37,6 +38,7 @@ const ( OpenLdapConfigFieldUserObjectClass = "userObjectClass" OpenLdapConfigFieldUserSearchAttribute = "userSearchAttribute" OpenLdapConfigFieldUserSearchBase = "userSearchBase" + OpenLdapConfigFieldUserSearchFilter = "userSearchFilter" ) type OpenLdapConfig struct { @@ -55,6 +57,7 @@ type OpenLdapConfig struct { GroupObjectClass string `json:"groupObjectClass,omitempty" yaml:"groupObjectClass,omitempty"` GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" yaml:"groupSearchAttribute,omitempty"` GroupSearchBase string `json:"groupSearchBase,omitempty" yaml:"groupSearchBase,omitempty"` + GroupSearchFilter string `json:"groupSearchFilter,omitempty" yaml:"groupSearchFilter,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` NestedGroupMembershipEnabled bool `json:"nestedGroupMembershipEnabled,omitempty" yaml:"nestedGroupMembershipEnabled,omitempty"` @@ -75,4 +78,5 @@ type OpenLdapConfig struct { UserObjectClass string `json:"userObjectClass,omitempty" yaml:"userObjectClass,omitempty"` UserSearchAttribute string `json:"userSearchAttribute,omitempty" yaml:"userSearchAttribute,omitempty"` UserSearchBase string `json:"userSearchBase,omitempty" yaml:"userSearchBase,omitempty"` + UserSearchFilter string `json:"userSearchFilter,omitempty" yaml:"userSearchFilter,omitempty"` }