Merge pull request #472 from ganesh-k13/bot-1.22

BOT 1.22 Support

Author: kumar-swamy

crd/bot/README.md

@@ -24,175 +24,6 @@ Based on the type of protections required, you can specify the metadata and use
 
 The Bot CRD is available in the Citrix ingress controller GitHub repo at [bot-crd.yaml](https://raw.githubusercontent.com/citrix/citrix-k8s-ingress-controller/master/crd/bot/bot-crd.yaml). The Bot CRD provides attributes for the various options that are required to define the bot management policies on Citrix ADC.
 
-The following is the Bot CRD definition:
-
-```yml
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: bots.citrix.com
-spec:
-  group: citrix.com
-  version: v1
-  names:
-    kind: bot
-    plural: bots
-    singular: bot
-  scope: Namespaced
-  subresources:
-    status: {}
-  additionalPrinterColumns:
-    - name: Status
-      type: string
-      description: "Current Status of the CRD"
-      JSONPath: .status.state
-    - name: Message
-      type: string
-      description: "Status Message"
-      JSONPath: .status.status_message
-  validation:
-    openAPIV3Schema:
-      required: [spec]
-      properties:
-        spec:
-          type: object
-          properties:
-            servicenames:
-              description: 'Name of the services to which the bot policies are applied.'
-              type: array
-              items:
-                type: string
-                maxLength: 127
-            signatures:
-              description: 'Location of external bot signature file'
-              type: string
-            redirect_url:
-              description: 'url to redirect when bot violation is hit'
-              type: string
-            target:
-              description: 'To control what traffic to be inspected by BOT. If you do not provide the target, everything will be inspected by default'
-              type: object
-              properties:
-                paths:
-                  type: array
-                  description: "List of http urls to inspect"
-                  items:
-                    type: string
-                    description: "URL path"
-                method:
-                  type: array
-                  description: "List of http methods to inspect"
-                  items:
-                    type: string
-                    enum: ['GET', 'PUT', 'POST','DELETE']
-                header:
-                  type: array
-                  description: "List of http headers to inspect"
-                  items:
-                    type: string
-                    description: "header name"
-            security_checks:
-              description: 'To enable/disable bot ecurity checks'
-              type: object
-              properties:
-                allow_list:
-                  type: string
-                  enum: ['ON', 'OFF']
-                block_list:
-                  type: string
-                  enum: ['ON', 'OFF']
-                device_fingerprint:
-                  oneOf:
-                    - type: string
-                      enum: ['ON', 'OFF']
-                    - type: object
-                      properties:
-                        action:
-                          type: array
-                          items:
-                            type: string
-                reputation:
-                  type: string
-                  enum: ['ON', 'OFF']
-                ratelimit:
-                  type: string
-                  enum: ['ON', 'OFF']
-                tps:
-                  type: string
-                  enum: ['ON', 'OFF']
-                trap:
-                  oneOf:
-                    - type: string
-                      enum: ['ON', 'OFF']
-                    - type: object
-                      properties:
-                        action:
-                          type: array
-                          items:
-                            type: string
-            relaxations:
-              description: 'Section which contains binding rules for bot security checks'
-              type: object
-              properties:
-                allow_list:
-                  type: array
-                  items:
-                    type: object
-                    properties:
-                      subnet:
-                        type: object
-                      ip:
-                        type: object
-                      expression:
-                        type: object
- 
-                block_list:
-                  type: array
-                  items:
-                    type: object
-                    properties:
-                      subnet:
-                        type: object
-                      ip:
-                        type: object
-                      expression:
-                        type: object
-                ratelimit:
-                  type: array
-                  items:
-                    type: object
-                    properties:
-                      url:
-                        type: object
-                      ip:
-                        type: object
-                      cookie:
-                        type: object
-                reputation:
-                  type: object
-                  properties:
-                    categories:
-                      oneOf:
-                        - type: string
-                        - type: object
-                captcha:
-                  type: array
-                tps:
-                  type: object
-                  properties:
-                    geolocation:
-                      type: object
-                    host:
-                      type: object
-                    ip:
-                      type: object
-                    host:
-                      type: object
-                trap:
-                  type: object
- 
-```
-
 ## Bot CRD attributes
 
 The following table lists the various attributes provided in the Bot CRD:
@@ -381,13 +212,16 @@ spec:
         - frontend
     redirect_url: "/error_page.html"
     security_checks:
-       trap: ["log","drop"]
-         bindings:
-      trap:
-      urls:
+       trap:
+         action:
+           - "log"
+           - "drop"
+    bindings:
+      trapinsertion:
+        urls:
           - "/index.html"
-        - "/submit.php"
-        - "/login.html"
+          - "/submit.php"
+          - "/login.html"
 ```
 
 **Enable IP reputation to reject requests of a particular category**
@@ -446,4 +280,4 @@ spec:
           action:
               - "log"
               - "reset"
-```
+```