diff --git a/config/v1/0000_10_config-operator_01_oauth.crd.yaml b/config/v1/0000_10_config-operator_01_oauth.crd.yaml index 51acbff468e..456a7594cf2 100644 --- a/config/v1/0000_10_config-operator_01_oauth.crd.yaml +++ b/config/v1/0000_10_config-operator_01_oauth.crd.yaml @@ -295,16 +295,27 @@ spec: type: array items: type: string + x-kubernetes-list-type: atomic + groups: + description: groups is the list of claims value of which should be used to synchronize groups from the OIDC provider to OpenShift for the user. If multiple claims are specified, the first one with a non-empty value is used. + type: array + items: + description: OpenIDClaim represents a claim retrieved from an OpenID provider's tokens or userInfo responses + type: string + minLength: 1 + x-kubernetes-list-type: atomic name: description: name is the list of claims whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity type: array items: type: string + x-kubernetes-list-type: atomic preferredUsername: description: preferredUsername is the list of claims whose values should be used as the preferred username. If unspecified, the preferred username is determined from the value of the sub claim type: array items: type: string + x-kubernetes-list-type: atomic clientID: description: clientID is the oauth client ID type: string diff --git a/config/v1/zz_generated.deepcopy.go b/config/v1/zz_generated.deepcopy.go index db13d13094c..dfb4cf79377 100644 --- a/config/v1/zz_generated.deepcopy.go +++ b/config/v1/zz_generated.deepcopy.go @@ -2959,6 +2959,11 @@ func (in *OpenIDClaims) DeepCopyInto(out *OpenIDClaims) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]OpenIDClaim, len(*in)) + copy(*out, *in) + } return } diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go index 63374ff3637..179d0d87b31 100644 --- a/config/v1/zz_generated.swagger_doc_generated.go +++ b/config/v1/zz_generated.swagger_doc_generated.go @@ -1486,6 +1486,7 @@ var map_OpenIDClaims = map[string]string{ "preferredUsername": "preferredUsername is the list of claims whose values should be used as the preferred username. If unspecified, the preferred username is determined from the value of the sub claim", "name": "name is the list of claims whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity", "email": "email is the list of claims whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", + "groups": "groups is the list of claims value of which should be used to synchronize groups from the OIDC provider to OpenShift for the user. If multiple claims are specified, the first one with a non-empty value is used.", } func (OpenIDClaims) SwaggerDoc() map[string]string { diff --git a/osin/v1/zz_generated.deepcopy.go b/osin/v1/zz_generated.deepcopy.go index eeeaae99fb5..c014967a6ef 100644 --- a/osin/v1/zz_generated.deepcopy.go +++ b/osin/v1/zz_generated.deepcopy.go @@ -404,6 +404,11 @@ func (in *OpenIDClaims) DeepCopyInto(out *OpenIDClaims) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]string, len(*in)) + copy(*out, *in) + } return }