change to httplistener

kgateway-dev · Jan 30, 2025 · 4f4c5f9 · 4f4c5f9
1 parent 8cef85f
commit 4f4c5f9
Show file tree

Hide file tree

Showing 17 changed files with 676 additions and 529 deletions.
diff --git a/install/helm/kgateway/crds/gateway.kgateway.dev_httplistenerpolicies.yaml b/install/helm/kgateway/crds/gateway.kgateway.dev_httplistenerpolicies.yaml
@@ -34,6 +34,194 @@ spec:
             type: object
           spec:
             properties:
+              accessLoggingService:
+                properties:
+                  accessLog:
+                    items:
+                      properties:
+                        fileSink:
+                          properties:
+                            jsonFormat:
+                              type: object
+                              x-kubernetes-preserve-unknown-fields: true
+                            path:
+                              type: string
+                            stringFormat:
+                              type: string
+                          required:
+                          - path
+                          type: object
+                          x-kubernetes-validations:
+                          - message: Only one of stringFormat or jsonFormat can be
+                              set
+                            rule: 1 == (self.stringFormat != null?1:0) + (self.jsonFormat
+                              != null?1:0)
+                        filter:
+                          properties:
+                            filterSpecifier:
+                              properties:
+                                durationFilter:
+                                  properties:
+                                    comparison:
+                                      properties:
+                                        op:
+                                          enum:
+                                          - EQ
+                                          - GE
+                                          - LE
+                                          format: int32
+                                          type: integer
+                                        value:
+                                          properties:
+                                            defaultValue:
+                                              format: int32
+                                              maximum: 4294967295
+                                              minimum: 0
+                                              type: integer
+                                            runtimeKey:
+                                              type: string
+                                          type: object
+                                      required:
+                                      - op
+                                      type: object
+                                  required:
+                                  - comparison
+                                  type: object
+                                grpcStatusFilter:
+                                  properties:
+                                    exclude:
+                                      type: boolean
+                                    statuses:
+                                      items:
+                                        enum:
+                                        - OK
+                                        - CANCELED
+                                        - UNKNOWN
+                                        - INVALID_ARGUMENT
+                                        - DEADLINE_EXCEEDED
+                                        - NOT_FOUND
+                                        - ALREADY_EXISTS
+                                        - PERMISSION_DENIED
+                                        - RESOURCE_EXHAUSTED
+                                        - FAILED_PRECONDITION
+                                        - ABORTED
+                                        - OUT_OF_RANGE
+                                        - UNIMPLEMENTED
+                                        - INTERNAL
+                                        - UNAVAILABLE
+                                        - DATA_LOSS
+                                        - UNAUTHENTICATED
+                                        format: int32
+                                        type: integer
+                                      minItems: 1
+                                      type: array
+                                  type: object
+                                headerFilter:
+                                  properties:
+                                    header:
+                                      type: object
+                                  required:
+                                  - header
+                                  type: object
+                                notHealthCheckFilter:
+                                  type: object
+                                responseFlagFilter:
+                                  properties:
+                                    flags:
+                                      items:
+                                        type: string
+                                      minItems: 1
+                                      type: array
+                                  required:
+                                  - flags
+                                  type: object
+                                runtimeFilter:
+                                  properties:
+                                    percentSampled:
+                                      properties:
+                                        denominator:
+                                          format: int32
+                                          type: integer
+                                        numerator:
+                                          format: int32
+                                          type: integer
+                                      type: object
+                                    runtimeKey:
+                                      minLength: 1
+                                      type: string
+                                    useIndependentRandomness:
+                                      type: boolean
+                                  type: object
+                                statusCodeFilter:
+                                  properties:
+                                    comparison:
+                                      properties:
+                                        op:
+                                          enum:
+                                          - EQ
+                                          - GE
+                                          - LE
+                                          format: int32
+                                          type: integer
+                                        value:
+                                          properties:
+                                            defaultValue:
+                                              format: int32
+                                              maximum: 4294967295
+                                              minimum: 0
+                                              type: integer
+                                            runtimeKey:
+                                              type: string
+                                          type: object
+                                      required:
+                                      - op
+                                      type: object
+                                  type: object
+                                  x-kubernetes-validations:
+                                  - message: There must one and only one FilterSpecifier
+                                      type set
+                                    rule: 1 == (self.statusCodeFilter != null?1:0)
+                                      + (self.durationFilter != null?1:0) + (self.notHealthCheckFilter
+                                      != null?1:0) + (self.traceableFilter != null?1:0)
+                                      + (self.runtimeFilter != null?1:0) + (self.andFilter
+                                      != null?1:0) + (self.orFilter != null?1:0) +
+                                      (self.headerFilter != null?1:0) + (self.responseFlagFilter
+                                      != null?1:0) + (self.grpcStatusFilter != null?1:0)
+                                traceableFilter:
+                                  type: object
+                              type: object
+                          type: object
+                        grpcService:
+                          properties:
+                            additionalRequestHeadersToLog:
+                              items:
+                                type: string
+                              type: array
+                            additionalResponseHeadersToLog:
+                              items:
+                                type: string
+                              type: array
+                            additionalResponseTrailersToLog:
+                              items:
+                                type: string
+                              type: array
+                            logName:
+                              type: string
+                            staticClusterName:
+                              minLength: 1
+                              type: string
+                          required:
+                          - logName
+                          - staticClusterName
+                          type: object
+                      type: object
+                      x-kubernetes-validations:
+                      - message: Only one of grpcService or fileSink can be set
+                        rule: 1 == (self.grpcService != null?1:0) + (self.fileSink
+                          != null?1:0)
+                    minItems: 1
+                    type: array
+                type: object
               compress:
                 type: boolean
               targetRef:

diff --git a/install/helm/kgateway/crds/gateway.kgateway.dev_listenerpolicies.yaml b/install/helm/kgateway/crds/gateway.kgateway.dev_listenerpolicies.yaml
@@ -34,194 +34,6 @@ spec:
             type: object
           spec:
             properties:
-              accessLoggingService:
-                properties:
-                  accessLog:
-                    items:
-                      properties:
-                        fileSink:
-                          properties:
-                            jsonFormat:
-                              type: object
-                              x-kubernetes-preserve-unknown-fields: true
-                            path:
-                              type: string
-                            stringFormat:
-                              type: string
-                          required:
-                          - path
-                          type: object
-                          x-kubernetes-validations:
-                          - message: Only one of stringFormat or jsonFormat can be
-                              set
-                            rule: 1 == (self.stringFormat != null?1:0) + (self.jsonFormat
-                              != null?1:0)
-                        filter:
-                          properties:
-                            filterSpecifier:
-                              properties:
-                                durationFilter:
-                                  properties:
-                                    comparison:
-                                      properties:
-                                        op:
-                                          enum:
-                                          - EQ
-                                          - GE
-                                          - LE
-                                          format: int32
-                                          type: integer
-                                        value:
-                                          properties:
-                                            defaultValue:
-                                              format: int32
-                                              maximum: 4294967295
-                                              minimum: 0
-                                              type: integer
-                                            runtimeKey:
-                                              type: string
-                                          type: object
-                                      required:
-                                      - op
-                                      type: object
-                                  required:
-                                  - comparison
-                                  type: object
-                                grpcStatusFilter:
-                                  properties:
-                                    exclude:
-                                      type: boolean
-                                    statuses:
-                                      items:
-                                        enum:
-                                        - OK
-                                        - CANCELED
-                                        - UNKNOWN
-                                        - INVALID_ARGUMENT
-                                        - DEADLINE_EXCEEDED
-                                        - NOT_FOUND
-                                        - ALREADY_EXISTS
-                                        - PERMISSION_DENIED
-                                        - RESOURCE_EXHAUSTED
-                                        - FAILED_PRECONDITION
-                                        - ABORTED
-                                        - OUT_OF_RANGE
-                                        - UNIMPLEMENTED
-                                        - INTERNAL
-                                        - UNAVAILABLE
-                                        - DATA_LOSS
-                                        - UNAUTHENTICATED
-                                        format: int32
-                                        type: integer
-                                      minItems: 1
-                                      type: array
-                                  type: object
-                                headerFilter:
-                                  properties:
-                                    header:
-                                      type: object
-                                  required:
-                                  - header
-                                  type: object
-                                notHealthCheckFilter:
-                                  type: object
-                                responseFlagFilter:
-                                  properties:
-                                    flags:
-                                      items:
-                                        type: string
-                                      minItems: 1
-                                      type: array
-                                  required:
-                                  - flags
-                                  type: object
-                                runtimeFilter:
-                                  properties:
-                                    percentSampled:
-                                      properties:
-                                        denominator:
-                                          format: int32
-                                          type: integer
-                                        numerator:
-                                          format: int32
-                                          type: integer
-                                      type: object
-                                    runtimeKey:
-                                      minLength: 1
-                                      type: string
-                                    useIndependentRandomness:
-                                      type: boolean
-                                  type: object
-                                statusCodeFilter:
-                                  properties:
-                                    comparison:
-                                      properties:
-                                        op:
-                                          enum:
-                                          - EQ
-                                          - GE
-                                          - LE
-                                          format: int32
-                                          type: integer
-                                        value:
-                                          properties:
-                                            defaultValue:
-                                              format: int32
-                                              maximum: 4294967295
-                                              minimum: 0
-                                              type: integer
-                                            runtimeKey:
-                                              type: string
-                                          type: object
-                                      required:
-                                      - op
-                                      type: object
-                                  type: object
-                                  x-kubernetes-validations:
-                                  - message: There must one and only one FilterSpecifier
-                                      type set
-                                    rule: 1 == (self.statusCodeFilter != null?1:0)
-                                      + (self.durationFilter != null?1:0) + (self.notHealthCheckFilter
-                                      != null?1:0) + (self.traceableFilter != null?1:0)
-                                      + (self.runtimeFilter != null?1:0) + (self.andFilter
-                                      != null?1:0) + (self.orFilter != null?1:0) +
-                                      (self.headerFilter != null?1:0) + (self.responseFlagFilter
-                                      != null?1:0) + (self.grpcStatusFilter != null?1:0)
-                                traceableFilter:
-                                  type: object
-                              type: object
-                          type: object
-                        grpcService:
-                          properties:
-                            additionalRequestHeadersToLog:
-                              items:
-                                type: string
-                              type: array
-                            additionalResponseHeadersToLog:
-                              items:
-                                type: string
-                              type: array
-                            additionalResponseTrailersToLog:
-                              items:
-                                type: string
-                              type: array
-                            logName:
-                              type: string
-                            staticClusterName:
-                              minLength: 1
-                              type: string
-                          required:
-                          - logName
-                          - staticClusterName
-                          type: object
-                      type: object
-                      x-kubernetes-validations:
-                      - message: Only one of grpcService or fileSink can be set
-                        rule: 1 == (self.grpcService != null?1:0) + (self.fileSink
-                          != null?1:0)
-                    minItems: 1
-                    type: array
-                type: object
               perConnectionBufferLimitBytes:
                 format: int32
                 type: integer