Merge pull request #380 from RaveendraHolla/master

Auth CRD Changes.

Author: sreejithgs

crd/auth/auth-crd.yaml

@@ -82,24 +82,33 @@ spec:
                             required: [tls_secret]
                           - properties:             
                             required: [preconfigured]
-                        vip:
+                        ingress_name:
                           description: |+
-                                       'Frontend IP of ingress for which the authentication 
-                                        using forms is applicable. This refers to frontend-ip provided 
-                                        with Ingress'
+                                       'Ingress name for which the authentication using forms
+                                        is applicable.'
                           type: string
+                          maxLength: 63
                         lb_service_name:
                           description: |+
                                        'Service of type LoadBalancer for which the authentication using forms
                                         is applicable.'
                           type: string
                           maxLength: 63
+                        vip:
+                          description: |+
+                                       'Frontend IP of ingress for which the authentication 
+                                        using forms is applicable. This refers to frontend-ip provided 
+                                        with Ingress. It is suggested to use vip, if more than one Ingress
+                                        resource use the same frontend-ip'
+                          type: string
                       required: [authentication_host, authentication_host_cert]
                       oneOf:
                       - properties:
-                        required: [vip]
+                        required: [ingress_name]                      
                       - properties:
                         required: [lb_service_name]
+                      - properties:
+                        required: [vip]
               oneOf:
                 - properties:
                     using_request_header:
@@ -136,6 +145,22 @@ spec:
                               items:
                                 type: string
                                 maxLength: 127
+                          jwks_uri:
+                              description: |+
+                                          'URL of the endpoint that contains JWKs (Json Web Key) for 
+                                           JWT (Json Web Token) verification'
+                              type: string
+                              maxLength: 127
+                          introspect_url:
+                              description: ' URL of the introspection server'
+                              type: string
+                              maxLength: 127
+                          client_credentials:
+                              description: |+
+                                           'secrets object that contains Client Id and secret as known 
+                                            to Introspection server'
+                              type: string
+                              maxLength: 253
                           token_in_hdr:
                               description: |+
                                            'custom header name where token is present,
@@ -164,27 +189,46 @@ spec:
                               items:
                                 type: string
                                 maxLength: 127
-                          jwks_uri:
+                          metadata_url:
+                              description: 'URL used to get OAUTH/OIDC provider metadata'
+                              type: string
+                              maxLength: 255
+                          user_field:
                               description: |+
-                                          'URL of the endpoint that contains JWKs (Json Web Key) for 
-                                           JWT (Json Web Token) verification'
+                                           'Attribute in the token from which username should be extracted. 
+                                            by default, ADC looks at email attribute for user id'
                               type: string
                               maxLength: 127
-                          introspect_url:
-                              description: ' URL of the introspection server'
+                          default_group:
+                              description: |+
+                                           'group assigned to the request if authentication succeeds,
+                                            this is in addition to any extracted groups from token'
                               type: string
-                              maxLength: 127
-                          client_credentials:
+                              maxLength: 63
+                          grant_type:
+                              description: 'used to specify the type of flow to the token end point, defaults to CODE'
+                              type: array
+                              items:
+                                type: string
+                                enum: ['CODE','PASSWORD']
+                          pkce:
+                              description: 'specify whether to enable Proof Key Code Exchange, defaults to ENABLED'
+                              type: string
+                              enum: ['ENABLED', 'DISABLED']
+                          token_ep_auth_method:
                               description: |+
-                                           'secrets object that contains Client Id and secret as known 
-                                            to Introspection server'
+                                           'authentication method to be used with token end point, 
+                                            defaults to client_secret_post'
                               type: string
-                              maxLength: 253                              
+                              enum: ['client_secret_post', 'client_secret_jwt']
+
                       anyOf:
                       - properties:
                         required : [jwks_uri]
                       - properties:
                         required : [introspect_url, client_credentials]
+                      - properties:
+                        required : [metadata_url]
 
                     ldap:
                       description: 'LDAP authentication provider'