This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5eaff76b0ecc0e2d41c90dbc6f26b203af3ab49e Author: Pasquale Congiusti <[email protected]> AuthorDate: Wed Apr 21 15:15:45 2021 +0200 refactor(crd): updated crd after error-handler --- .../crd/bases/camel.apache.org_integrations.yaml | 13 + .../bases/camel.apache.org_kameletbindings.yaml | 413 +++++++++++---------- .../1.4.0/camel.apache.org_integrations.yaml | 13 + .../1.4.0/camel.apache.org_kameletbindings.yaml | 413 +++++++++++---------- helm/camel-k/crds/crd-integration.yaml | 13 + helm/camel-k/crds/crd-kamelet-binding.yaml | 413 +++++++++++---------- 6 files changed, 699 insertions(+), 579 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml index 96e26b9..c838f1f 100644 --- a/config/crd/bases/camel.apache.org_integrations.yaml +++ b/config/crd/bases/camel.apache.org_integrations.yaml @@ -88,6 +88,19 @@ spec: items: type: string type: array + errorHandler: + description: ErrorHandlerSpec respresents an integration error handler + to be used as default at runtime + properties: + configuration: + description: ErrorHandlerConfiguration -- + type: object + x-kubernetes-preserve-unknown-fields: true + type: + type: string + uri: + type: string + type: object flows: items: description: Flow is an unstructured object representing a Camel diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml index 7c43c55..046549c 100644 --- a/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -67,214 +67,228 @@ spec: description: ErrorHandler is an optional handler called upon an error occuring in the integration properties: - properties: - description: Properties are a key value representation of endpoint - properties + configuration: type: object x-kubernetes-preserve-unknown-fields: true - ref: - description: Ref can be used to declare a Kubernetes resource - as source/sink endpoint + endpoint: + description: Endpoint represents a source/sink external entity properties: - apiVersion: - description: API version of the referent. - type: string - fieldPath: - description: 'If referring to a piece of an object instead - of an entire object, this string should contain a valid - JSON/Go field access statement, such as desiredState.manifest.containers[2]. - For example, if the object reference is to a container within - a pod, this would take on a value like: "spec.containers{name}" - (where "name" refers to the name of the container that triggered - the event) or if no container name is specified "spec.containers[2]" - (container with index 2 in this pod). This syntax is chosen - only to have some well-defined way of referencing a part - of an object. TODO: this design is not final and this field - is subject to change in the future.' - type: string - kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' - type: string - namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' - type: string - resourceVersion: - description: 'Specific resourceVersion to which this reference - is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' - type: string - uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' - type: string - type: object - types: - additionalProperties: properties: - mediaType: - type: string - schema: - description: JSONSchemaProps is a JSON-Schema following - Specification Draft 4 (http://json-schema.org/). + description: Properties are a key value representation of + endpoint properties + type: object + x-kubernetes-preserve-unknown-fields: true + ref: + description: Ref can be used to declare a Kubernetes resource + as source/sink endpoint + properties: + apiVersion: + description: API version of the referent. + type: string + fieldPath: + description: 'If referring to a piece of an object instead + of an entire object, this string should contain a valid + JSON/Go field access statement, such as desiredState.manifest.containers[2]. + For example, if the object reference is to a container + within a pod, this would take on a value like: "spec.containers{name}" + (where "name" refers to the name of the container that + triggered the event) or if no container name is specified + "spec.containers[2]" (container with index 2 in this + pod). This syntax is chosen only to have some well-defined + way of referencing a part of an object. TODO: this design + is not final and this field is subject to change in + the future.' + type: string + kind: + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + type: string + namespace: + description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' + type: string + resourceVersion: + description: 'Specific resourceVersion to which this reference + is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' + type: string + uid: + description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' + type: string + type: object + types: + additionalProperties: properties: - $schema: - description: JSONSchemaURL represents a schema url. + mediaType: type: string - description: - type: string - example: - description: 'JSON represents any valid JSON value. - These types are supported: bool, int64, float64, string, - []interface{}, map[string]interface{} and nil.' - x-kubernetes-preserve-unknown-fields: true - externalDocs: - description: ExternalDocumentation allows referencing - an external resource for extended documentation. + schema: + description: JSONSchemaProps is a JSON-Schema following + Specification Draft 4 (http://json-schema.org/). properties: + $schema: + description: JSONSchemaURL represents a schema url. + type: string description: type: string - url: + example: + description: 'JSON represents any valid JSON value. + These types are supported: bool, int64, float64, + string, []interface{}, map[string]interface{} + and nil.' + x-kubernetes-preserve-unknown-fields: true + externalDocs: + description: ExternalDocumentation allows referencing + an external resource for extended documentation. + properties: + description: + type: string + url: + type: string + type: object + id: type: string - type: object - id: - type: string - properties: - additionalProperties: properties: - default: - description: default is a default value for undefined - object fields. - x-kubernetes-preserve-unknown-fields: true - description: - type: string - enum: - items: - description: 'JSON represents any valid JSON - value. These types are supported: bool, int64, - float64, string, []interface{}, map[string]interface{} - and nil.' - x-kubernetes-preserve-unknown-fields: true - type: array - example: - description: 'JSON represents any valid JSON value. - These types are supported: bool, int64, float64, - string, []interface{}, map[string]interface{} - and nil.' - x-kubernetes-preserve-unknown-fields: true - exclusiveMaximum: - type: boolean - exclusiveMinimum: - type: boolean - format: - description: "format is an OpenAPI v3 format string. - Unknown formats are ignored. The following formats - are validated: \n - bsonobjectid: a bson object - ID, i.e. a 24 characters hex string - uri: an - URI as parsed by Golang net/url.ParseRequestURI - - email: an email address as parsed by Golang - net/mail.ParseAddress - hostname: a valid representation - for an Internet host name, as defined by RFC - 1034, section 3.1 [RFC1034]. - ipv4: an IPv4 - IP as parsed by Golang net.ParseIP - ipv6: an - IPv6 IP as parsed by Golang net.ParseIP - cidr: - a CIDR as parsed by Golang net.ParseCIDR - mac: - a MAC address as parsed by Golang net.ParseMAC - - uuid: an UUID that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$ - - uuid3: an UUID3 that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$ - - uuid4: an UUID4 that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ - - uuid5: an UUID5 that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ - - isbn: an ISBN10 or ISBN13 number string like - \"0321751043\" or \"978-0321751041\" - isbn10: - an ISBN10 number string like \"0321751043\" - - isbn13: an ISBN13 number string like \"978-0321751041\" - - creditcard: a credit card number defined by - the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$ - with any non digit characters mixed in - ssn: - a U.S. social security number following the - regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ - - hexcolor: an hexadecimal color code like \"#FFFFFF: - following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$ - - rgbcolor: an RGB color code like rgb like - \"rgb(255,255,2559\" - byte: base64 encoded - binary data - password: any kind of string - - date: a date string like \"2006-01-02\" as defined - by full-date in RFC3339 - duration: a duration - string like \"22 ns\" as parsed by Golang time.ParseDuration - or compatible with Scala duration format - datetime: - a date time string like \"2014-12-15T19:30:20.000Z\" - as defined by date-time in RFC3339." - type: string - id: - type: string - maxItems: - format: int64 - type: integer - maxLength: - format: int64 - type: integer - maxProperties: - format: int64 - type: integer - maximum: - description: A Number represents a JSON number - literal. - type: string - minItems: - format: int64 - type: integer - minLength: - format: int64 - type: integer - minProperties: - format: int64 - type: integer - minimum: - description: A Number represents a JSON number - literal. - type: string - multipleOf: - description: A Number represents a JSON number - literal. - type: string - nullable: - type: boolean - pattern: - type: string - title: - type: string - type: + additionalProperties: + properties: + default: + description: default is a default value for + undefined object fields. + x-kubernetes-preserve-unknown-fields: true + description: + type: string + enum: + items: + description: 'JSON represents any valid + JSON value. These types are supported: + bool, int64, float64, string, []interface{}, + map[string]interface{} and nil.' + x-kubernetes-preserve-unknown-fields: true + type: array + example: + description: 'JSON represents any valid JSON + value. These types are supported: bool, + int64, float64, string, []interface{}, map[string]interface{} + and nil.' + x-kubernetes-preserve-unknown-fields: true + exclusiveMaximum: + type: boolean + exclusiveMinimum: + type: boolean + format: + description: "format is an OpenAPI v3 format + string. Unknown formats are ignored. The + following formats are validated: \n - bsonobjectid: + a bson object ID, i.e. a 24 characters hex + string - uri: an URI as parsed by Golang + net/url.ParseRequestURI - email: an email + address as parsed by Golang net/mail.ParseAddress + - hostname: a valid representation for an + Internet host name, as defined by RFC 1034, + section 3.1 [RFC1034]. - ipv4: an IPv4 IP + as parsed by Golang net.ParseIP - ipv6: + an IPv6 IP as parsed by Golang net.ParseIP + - cidr: a CIDR as parsed by Golang net.ParseCIDR + - mac: a MAC address as parsed by Golang + net.ParseMAC - uuid: an UUID that allows + uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$ + - uuid3: an UUID3 that allows uppercase + defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$ + - uuid4: an UUID4 that allows uppercase + defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ + - uuid5: an UUID5 that allows uppercase + defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ + - isbn: an ISBN10 or ISBN13 number string + like \"0321751043\" or \"978-0321751041\" + - isbn10: an ISBN10 number string like \"0321751043\" + - isbn13: an ISBN13 number string like \"978-0321751041\" + - creditcard: a credit card number defined + by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$ + with any non digit characters mixed in - + ssn: a U.S. social security number following + the regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ + - hexcolor: an hexadecimal color code like + \"#FFFFFF: following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$ + - rgbcolor: an RGB color code like rgb like + \"rgb(255,255,2559\" - byte: base64 encoded + binary data - password: any kind of string + - date: a date string like \"2006-01-02\" + as defined by full-date in RFC3339 - duration: + a duration string like \"22 ns\" as parsed + by Golang time.ParseDuration or compatible + with Scala duration format - datetime: a + date time string like \"2014-12-15T19:30:20.000Z\" + as defined by date-time in RFC3339." + type: string + id: + type: string + maxItems: + format: int64 + type: integer + maxLength: + format: int64 + type: integer + maxProperties: + format: int64 + type: integer + maximum: + description: A Number represents a JSON number + literal. + type: string + minItems: + format: int64 + type: integer + minLength: + format: int64 + type: integer + minProperties: + format: int64 + type: integer + minimum: + description: A Number represents a JSON number + literal. + type: string + multipleOf: + description: A Number represents a JSON number + literal. + type: string + nullable: + type: boolean + pattern: + type: string + title: + type: string + type: + type: string + uniqueItems: + type: boolean + x-descriptors: + description: The list of descriptors that + determine which UI components to use on + different views + items: + type: string + type: array + type: object + type: object + required: + items: type: string - uniqueItems: - type: boolean - x-descriptors: - description: The list of descriptors that determine - which UI components to use on different views - items: - type: string - type: array - type: object + type: array + title: + type: string + type: + type: string type: object - required: - items: - type: string - type: array - title: - type: string - type: - type: string type: object - type: object - description: Types defines the schema of the data produced/consumed - by the endpoint + description: Types defines the schema of the data produced/consumed + by the endpoint + type: object + uri: + description: URI can alternatively be used to specify the + (Camel) endpoint explicitly + type: string type: object - uri: - description: URI can alternatively be used to specify the (Camel) - endpoint explicitly + type: type: string type: object integration: @@ -298,6 +312,19 @@ spec: items: type: string type: array + errorHandler: + description: ErrorHandlerSpec respresents an integration error + handler to be used as default at runtime + properties: + configuration: + description: ErrorHandlerConfiguration -- + type: object + x-kubernetes-preserve-unknown-fields: true + type: + type: string + uri: + type: string + type: object flows: items: description: Flow is an unstructured object representing a Camel diff --git a/deploy/olm-catalog/camel-k-dev/1.4.0/camel.apache.org_integrations.yaml b/deploy/olm-catalog/camel-k-dev/1.4.0/camel.apache.org_integrations.yaml index 96e26b9..c838f1f 100644 --- a/deploy/olm-catalog/camel-k-dev/1.4.0/camel.apache.org_integrations.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.4.0/camel.apache.org_integrations.yaml @@ -88,6 +88,19 @@ spec: items: type: string type: array + errorHandler: + description: ErrorHandlerSpec respresents an integration error handler + to be used as default at runtime + properties: + configuration: + description: ErrorHandlerConfiguration -- + type: object + x-kubernetes-preserve-unknown-fields: true + type: + type: string + uri: + type: string + type: object flows: items: description: Flow is an unstructured object representing a Camel diff --git a/deploy/olm-catalog/camel-k-dev/1.4.0/camel.apache.org_kameletbindings.yaml b/deploy/olm-catalog/camel-k-dev/1.4.0/camel.apache.org_kameletbindings.yaml index 7c43c55..046549c 100644 --- a/deploy/olm-catalog/camel-k-dev/1.4.0/camel.apache.org_kameletbindings.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.4.0/camel.apache.org_kameletbindings.yaml @@ -67,214 +67,228 @@ spec: description: ErrorHandler is an optional handler called upon an error occuring in the integration properties: - properties: - description: Properties are a key value representation of endpoint - properties + configuration: type: object x-kubernetes-preserve-unknown-fields: true - ref: - description: Ref can be used to declare a Kubernetes resource - as source/sink endpoint + endpoint: + description: Endpoint represents a source/sink external entity properties: - apiVersion: - description: API version of the referent. - type: string - fieldPath: - description: 'If referring to a piece of an object instead - of an entire object, this string should contain a valid - JSON/Go field access statement, such as desiredState.manifest.containers[2]. - For example, if the object reference is to a container within - a pod, this would take on a value like: "spec.containers{name}" - (where "name" refers to the name of the container that triggered - the event) or if no container name is specified "spec.containers[2]" - (container with index 2 in this pod). This syntax is chosen - only to have some well-defined way of referencing a part - of an object. TODO: this design is not final and this field - is subject to change in the future.' - type: string - kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' - type: string - namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' - type: string - resourceVersion: - description: 'Specific resourceVersion to which this reference - is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' - type: string - uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' - type: string - type: object - types: - additionalProperties: properties: - mediaType: - type: string - schema: - description: JSONSchemaProps is a JSON-Schema following - Specification Draft 4 (http://json-schema.org/). + description: Properties are a key value representation of + endpoint properties + type: object + x-kubernetes-preserve-unknown-fields: true + ref: + description: Ref can be used to declare a Kubernetes resource + as source/sink endpoint + properties: + apiVersion: + description: API version of the referent. + type: string + fieldPath: + description: 'If referring to a piece of an object instead + of an entire object, this string should contain a valid + JSON/Go field access statement, such as desiredState.manifest.containers[2]. + For example, if the object reference is to a container + within a pod, this would take on a value like: "spec.containers{name}" + (where "name" refers to the name of the container that + triggered the event) or if no container name is specified + "spec.containers[2]" (container with index 2 in this + pod). This syntax is chosen only to have some well-defined + way of referencing a part of an object. TODO: this design + is not final and this field is subject to change in + the future.' + type: string + kind: + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + type: string + namespace: + description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' + type: string + resourceVersion: + description: 'Specific resourceVersion to which this reference + is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' + type: string + uid: + description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' + type: string + type: object + types: + additionalProperties: properties: - $schema: - description: JSONSchemaURL represents a schema url. + mediaType: type: string - description: - type: string - example: - description: 'JSON represents any valid JSON value. - These types are supported: bool, int64, float64, string, - []interface{}, map[string]interface{} and nil.' - x-kubernetes-preserve-unknown-fields: true - externalDocs: - description: ExternalDocumentation allows referencing - an external resource for extended documentation. + schema: + description: JSONSchemaProps is a JSON-Schema following + Specification Draft 4 (http://json-schema.org/). properties: + $schema: + description: JSONSchemaURL represents a schema url. + type: string description: type: string - url: + example: + description: 'JSON represents any valid JSON value. + These types are supported: bool, int64, float64, + string, []interface{}, map[string]interface{} + and nil.' + x-kubernetes-preserve-unknown-fields: true + externalDocs: + description: ExternalDocumentation allows referencing + an external resource for extended documentation. + properties: + description: + type: string + url: + type: string + type: object + id: type: string - type: object - id: - type: string - properties: - additionalProperties: properties: - default: - description: default is a default value for undefined - object fields. - x-kubernetes-preserve-unknown-fields: true - description: - type: string - enum: - items: - description: 'JSON represents any valid JSON - value. These types are supported: bool, int64, - float64, string, []interface{}, map[string]interface{} - and nil.' - x-kubernetes-preserve-unknown-fields: true - type: array - example: - description: 'JSON represents any valid JSON value. - These types are supported: bool, int64, float64, - string, []interface{}, map[string]interface{} - and nil.' - x-kubernetes-preserve-unknown-fields: true - exclusiveMaximum: - type: boolean - exclusiveMinimum: - type: boolean - format: - description: "format is an OpenAPI v3 format string. - Unknown formats are ignored. The following formats - are validated: \n - bsonobjectid: a bson object - ID, i.e. a 24 characters hex string - uri: an - URI as parsed by Golang net/url.ParseRequestURI - - email: an email address as parsed by Golang - net/mail.ParseAddress - hostname: a valid representation - for an Internet host name, as defined by RFC - 1034, section 3.1 [RFC1034]. - ipv4: an IPv4 - IP as parsed by Golang net.ParseIP - ipv6: an - IPv6 IP as parsed by Golang net.ParseIP - cidr: - a CIDR as parsed by Golang net.ParseCIDR - mac: - a MAC address as parsed by Golang net.ParseMAC - - uuid: an UUID that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$ - - uuid3: an UUID3 that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$ - - uuid4: an UUID4 that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ - - uuid5: an UUID5 that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ - - isbn: an ISBN10 or ISBN13 number string like - \"0321751043\" or \"978-0321751041\" - isbn10: - an ISBN10 number string like \"0321751043\" - - isbn13: an ISBN13 number string like \"978-0321751041\" - - creditcard: a credit card number defined by - the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$ - with any non digit characters mixed in - ssn: - a U.S. social security number following the - regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ - - hexcolor: an hexadecimal color code like \"#FFFFFF: - following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$ - - rgbcolor: an RGB color code like rgb like - \"rgb(255,255,2559\" - byte: base64 encoded - binary data - password: any kind of string - - date: a date string like \"2006-01-02\" as defined - by full-date in RFC3339 - duration: a duration - string like \"22 ns\" as parsed by Golang time.ParseDuration - or compatible with Scala duration format - datetime: - a date time string like \"2014-12-15T19:30:20.000Z\" - as defined by date-time in RFC3339." - type: string - id: - type: string - maxItems: - format: int64 - type: integer - maxLength: - format: int64 - type: integer - maxProperties: - format: int64 - type: integer - maximum: - description: A Number represents a JSON number - literal. - type: string - minItems: - format: int64 - type: integer - minLength: - format: int64 - type: integer - minProperties: - format: int64 - type: integer - minimum: - description: A Number represents a JSON number - literal. - type: string - multipleOf: - description: A Number represents a JSON number - literal. - type: string - nullable: - type: boolean - pattern: - type: string - title: - type: string - type: + additionalProperties: + properties: + default: + description: default is a default value for + undefined object fields. + x-kubernetes-preserve-unknown-fields: true + description: + type: string + enum: + items: + description: 'JSON represents any valid + JSON value. These types are supported: + bool, int64, float64, string, []interface{}, + map[string]interface{} and nil.' + x-kubernetes-preserve-unknown-fields: true + type: array + example: + description: 'JSON represents any valid JSON + value. These types are supported: bool, + int64, float64, string, []interface{}, map[string]interface{} + and nil.' + x-kubernetes-preserve-unknown-fields: true + exclusiveMaximum: + type: boolean + exclusiveMinimum: + type: boolean + format: + description: "format is an OpenAPI v3 format + string. Unknown formats are ignored. The + following formats are validated: \n - bsonobjectid: + a bson object ID, i.e. a 24 characters hex + string - uri: an URI as parsed by Golang + net/url.ParseRequestURI - email: an email + address as parsed by Golang net/mail.ParseAddress + - hostname: a valid representation for an + Internet host name, as defined by RFC 1034, + section 3.1 [RFC1034]. - ipv4: an IPv4 IP + as parsed by Golang net.ParseIP - ipv6: + an IPv6 IP as parsed by Golang net.ParseIP + - cidr: a CIDR as parsed by Golang net.ParseCIDR + - mac: a MAC address as parsed by Golang + net.ParseMAC - uuid: an UUID that allows + uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$ + - uuid3: an UUID3 that allows uppercase + defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$ + - uuid4: an UUID4 that allows uppercase + defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ + - uuid5: an UUID5 that allows uppercase + defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ + - isbn: an ISBN10 or ISBN13 number string + like \"0321751043\" or \"978-0321751041\" + - isbn10: an ISBN10 number string like \"0321751043\" + - isbn13: an ISBN13 number string like \"978-0321751041\" + - creditcard: a credit card number defined + by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$ + with any non digit characters mixed in - + ssn: a U.S. social security number following + the regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ + - hexcolor: an hexadecimal color code like + \"#FFFFFF: following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$ + - rgbcolor: an RGB color code like rgb like + \"rgb(255,255,2559\" - byte: base64 encoded + binary data - password: any kind of string + - date: a date string like \"2006-01-02\" + as defined by full-date in RFC3339 - duration: + a duration string like \"22 ns\" as parsed + by Golang time.ParseDuration or compatible + with Scala duration format - datetime: a + date time string like \"2014-12-15T19:30:20.000Z\" + as defined by date-time in RFC3339." + type: string + id: + type: string + maxItems: + format: int64 + type: integer + maxLength: + format: int64 + type: integer + maxProperties: + format: int64 + type: integer + maximum: + description: A Number represents a JSON number + literal. + type: string + minItems: + format: int64 + type: integer + minLength: + format: int64 + type: integer + minProperties: + format: int64 + type: integer + minimum: + description: A Number represents a JSON number + literal. + type: string + multipleOf: + description: A Number represents a JSON number + literal. + type: string + nullable: + type: boolean + pattern: + type: string + title: + type: string + type: + type: string + uniqueItems: + type: boolean + x-descriptors: + description: The list of descriptors that + determine which UI components to use on + different views + items: + type: string + type: array + type: object + type: object + required: + items: type: string - uniqueItems: - type: boolean - x-descriptors: - description: The list of descriptors that determine - which UI components to use on different views - items: - type: string - type: array - type: object + type: array + title: + type: string + type: + type: string type: object - required: - items: - type: string - type: array - title: - type: string - type: - type: string type: object - type: object - description: Types defines the schema of the data produced/consumed - by the endpoint + description: Types defines the schema of the data produced/consumed + by the endpoint + type: object + uri: + description: URI can alternatively be used to specify the + (Camel) endpoint explicitly + type: string type: object - uri: - description: URI can alternatively be used to specify the (Camel) - endpoint explicitly + type: type: string type: object integration: @@ -298,6 +312,19 @@ spec: items: type: string type: array + errorHandler: + description: ErrorHandlerSpec respresents an integration error + handler to be used as default at runtime + properties: + configuration: + description: ErrorHandlerConfiguration -- + type: object + x-kubernetes-preserve-unknown-fields: true + type: + type: string + uri: + type: string + type: object flows: items: description: Flow is an unstructured object representing a Camel diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml index 96e26b9..c838f1f 100644 --- a/helm/camel-k/crds/crd-integration.yaml +++ b/helm/camel-k/crds/crd-integration.yaml @@ -88,6 +88,19 @@ spec: items: type: string type: array + errorHandler: + description: ErrorHandlerSpec respresents an integration error handler + to be used as default at runtime + properties: + configuration: + description: ErrorHandlerConfiguration -- + type: object + x-kubernetes-preserve-unknown-fields: true + type: + type: string + uri: + type: string + type: object flows: items: description: Flow is an unstructured object representing a Camel diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml index 7c43c55..046549c 100644 --- a/helm/camel-k/crds/crd-kamelet-binding.yaml +++ b/helm/camel-k/crds/crd-kamelet-binding.yaml @@ -67,214 +67,228 @@ spec: description: ErrorHandler is an optional handler called upon an error occuring in the integration properties: - properties: - description: Properties are a key value representation of endpoint - properties + configuration: type: object x-kubernetes-preserve-unknown-fields: true - ref: - description: Ref can be used to declare a Kubernetes resource - as source/sink endpoint + endpoint: + description: Endpoint represents a source/sink external entity properties: - apiVersion: - description: API version of the referent. - type: string - fieldPath: - description: 'If referring to a piece of an object instead - of an entire object, this string should contain a valid - JSON/Go field access statement, such as desiredState.manifest.containers[2]. - For example, if the object reference is to a container within - a pod, this would take on a value like: "spec.containers{name}" - (where "name" refers to the name of the container that triggered - the event) or if no container name is specified "spec.containers[2]" - (container with index 2 in this pod). This syntax is chosen - only to have some well-defined way of referencing a part - of an object. TODO: this design is not final and this field - is subject to change in the future.' - type: string - kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' - type: string - namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' - type: string - resourceVersion: - description: 'Specific resourceVersion to which this reference - is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' - type: string - uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' - type: string - type: object - types: - additionalProperties: properties: - mediaType: - type: string - schema: - description: JSONSchemaProps is a JSON-Schema following - Specification Draft 4 (http://json-schema.org/). + description: Properties are a key value representation of + endpoint properties + type: object + x-kubernetes-preserve-unknown-fields: true + ref: + description: Ref can be used to declare a Kubernetes resource + as source/sink endpoint + properties: + apiVersion: + description: API version of the referent. + type: string + fieldPath: + description: 'If referring to a piece of an object instead + of an entire object, this string should contain a valid + JSON/Go field access statement, such as desiredState.manifest.containers[2]. + For example, if the object reference is to a container + within a pod, this would take on a value like: "spec.containers{name}" + (where "name" refers to the name of the container that + triggered the event) or if no container name is specified + "spec.containers[2]" (container with index 2 in this + pod). This syntax is chosen only to have some well-defined + way of referencing a part of an object. TODO: this design + is not final and this field is subject to change in + the future.' + type: string + kind: + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + type: string + namespace: + description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' + type: string + resourceVersion: + description: 'Specific resourceVersion to which this reference + is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' + type: string + uid: + description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' + type: string + type: object + types: + additionalProperties: properties: - $schema: - description: JSONSchemaURL represents a schema url. + mediaType: type: string - description: - type: string - example: - description: 'JSON represents any valid JSON value. - These types are supported: bool, int64, float64, string, - []interface{}, map[string]interface{} and nil.' - x-kubernetes-preserve-unknown-fields: true - externalDocs: - description: ExternalDocumentation allows referencing - an external resource for extended documentation. + schema: + description: JSONSchemaProps is a JSON-Schema following + Specification Draft 4 (http://json-schema.org/). properties: + $schema: + description: JSONSchemaURL represents a schema url. + type: string description: type: string - url: + example: + description: 'JSON represents any valid JSON value. + These types are supported: bool, int64, float64, + string, []interface{}, map[string]interface{} + and nil.' + x-kubernetes-preserve-unknown-fields: true + externalDocs: + description: ExternalDocumentation allows referencing + an external resource for extended documentation. + properties: + description: + type: string + url: + type: string + type: object + id: type: string - type: object - id: - type: string - properties: - additionalProperties: properties: - default: - description: default is a default value for undefined - object fields. - x-kubernetes-preserve-unknown-fields: true - description: - type: string - enum: - items: - description: 'JSON represents any valid JSON - value. These types are supported: bool, int64, - float64, string, []interface{}, map[string]interface{} - and nil.' - x-kubernetes-preserve-unknown-fields: true - type: array - example: - description: 'JSON represents any valid JSON value. - These types are supported: bool, int64, float64, - string, []interface{}, map[string]interface{} - and nil.' - x-kubernetes-preserve-unknown-fields: true - exclusiveMaximum: - type: boolean - exclusiveMinimum: - type: boolean - format: - description: "format is an OpenAPI v3 format string. - Unknown formats are ignored. The following formats - are validated: \n - bsonobjectid: a bson object - ID, i.e. a 24 characters hex string - uri: an - URI as parsed by Golang net/url.ParseRequestURI - - email: an email address as parsed by Golang - net/mail.ParseAddress - hostname: a valid representation - for an Internet host name, as defined by RFC - 1034, section 3.1 [RFC1034]. - ipv4: an IPv4 - IP as parsed by Golang net.ParseIP - ipv6: an - IPv6 IP as parsed by Golang net.ParseIP - cidr: - a CIDR as parsed by Golang net.ParseCIDR - mac: - a MAC address as parsed by Golang net.ParseMAC - - uuid: an UUID that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$ - - uuid3: an UUID3 that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$ - - uuid4: an UUID4 that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ - - uuid5: an UUID5 that allows uppercase defined - by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ - - isbn: an ISBN10 or ISBN13 number string like - \"0321751043\" or \"978-0321751041\" - isbn10: - an ISBN10 number string like \"0321751043\" - - isbn13: an ISBN13 number string like \"978-0321751041\" - - creditcard: a credit card number defined by - the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$ - with any non digit characters mixed in - ssn: - a U.S. social security number following the - regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ - - hexcolor: an hexadecimal color code like \"#FFFFFF: - following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$ - - rgbcolor: an RGB color code like rgb like - \"rgb(255,255,2559\" - byte: base64 encoded - binary data - password: any kind of string - - date: a date string like \"2006-01-02\" as defined - by full-date in RFC3339 - duration: a duration - string like \"22 ns\" as parsed by Golang time.ParseDuration - or compatible with Scala duration format - datetime: - a date time string like \"2014-12-15T19:30:20.000Z\" - as defined by date-time in RFC3339." - type: string - id: - type: string - maxItems: - format: int64 - type: integer - maxLength: - format: int64 - type: integer - maxProperties: - format: int64 - type: integer - maximum: - description: A Number represents a JSON number - literal. - type: string - minItems: - format: int64 - type: integer - minLength: - format: int64 - type: integer - minProperties: - format: int64 - type: integer - minimum: - description: A Number represents a JSON number - literal. - type: string - multipleOf: - description: A Number represents a JSON number - literal. - type: string - nullable: - type: boolean - pattern: - type: string - title: - type: string - type: + additionalProperties: + properties: + default: + description: default is a default value for + undefined object fields. + x-kubernetes-preserve-unknown-fields: true + description: + type: string + enum: + items: + description: 'JSON represents any valid + JSON value. These types are supported: + bool, int64, float64, string, []interface{}, + map[string]interface{} and nil.' + x-kubernetes-preserve-unknown-fields: true + type: array + example: + description: 'JSON represents any valid JSON + value. These types are supported: bool, + int64, float64, string, []interface{}, map[string]interface{} + and nil.' + x-kubernetes-preserve-unknown-fields: true + exclusiveMaximum: + type: boolean + exclusiveMinimum: + type: boolean + format: + description: "format is an OpenAPI v3 format + string. Unknown formats are ignored. The + following formats are validated: \n - bsonobjectid: + a bson object ID, i.e. a 24 characters hex + string - uri: an URI as parsed by Golang + net/url.ParseRequestURI - email: an email + address as parsed by Golang net/mail.ParseAddress + - hostname: a valid representation for an + Internet host name, as defined by RFC 1034, + section 3.1 [RFC1034]. - ipv4: an IPv4 IP + as parsed by Golang net.ParseIP - ipv6: + an IPv6 IP as parsed by Golang net.ParseIP + - cidr: a CIDR as parsed by Golang net.ParseCIDR + - mac: a MAC address as parsed by Golang + net.ParseMAC - uuid: an UUID that allows + uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$ + - uuid3: an UUID3 that allows uppercase + defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$ + - uuid4: an UUID4 that allows uppercase + defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ + - uuid5: an UUID5 that allows uppercase + defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ + - isbn: an ISBN10 or ISBN13 number string + like \"0321751043\" or \"978-0321751041\" + - isbn10: an ISBN10 number string like \"0321751043\" + - isbn13: an ISBN13 number string like \"978-0321751041\" + - creditcard: a credit card number defined + by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$ + with any non digit characters mixed in - + ssn: a U.S. social security number following + the regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ + - hexcolor: an hexadecimal color code like + \"#FFFFFF: following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$ + - rgbcolor: an RGB color code like rgb like + \"rgb(255,255,2559\" - byte: base64 encoded + binary data - password: any kind of string + - date: a date string like \"2006-01-02\" + as defined by full-date in RFC3339 - duration: + a duration string like \"22 ns\" as parsed + by Golang time.ParseDuration or compatible + with Scala duration format - datetime: a + date time string like \"2014-12-15T19:30:20.000Z\" + as defined by date-time in RFC3339." + type: string + id: + type: string + maxItems: + format: int64 + type: integer + maxLength: + format: int64 + type: integer + maxProperties: + format: int64 + type: integer + maximum: + description: A Number represents a JSON number + literal. + type: string + minItems: + format: int64 + type: integer + minLength: + format: int64 + type: integer + minProperties: + format: int64 + type: integer + minimum: + description: A Number represents a JSON number + literal. + type: string + multipleOf: + description: A Number represents a JSON number + literal. + type: string + nullable: + type: boolean + pattern: + type: string + title: + type: string + type: + type: string + uniqueItems: + type: boolean + x-descriptors: + description: The list of descriptors that + determine which UI components to use on + different views + items: + type: string + type: array + type: object + type: object + required: + items: type: string - uniqueItems: - type: boolean - x-descriptors: - description: The list of descriptors that determine - which UI components to use on different views - items: - type: string - type: array - type: object + type: array + title: + type: string + type: + type: string type: object - required: - items: - type: string - type: array - title: - type: string - type: - type: string type: object - type: object - description: Types defines the schema of the data produced/consumed - by the endpoint + description: Types defines the schema of the data produced/consumed + by the endpoint + type: object + uri: + description: URI can alternatively be used to specify the + (Camel) endpoint explicitly + type: string type: object - uri: - description: URI can alternatively be used to specify the (Camel) - endpoint explicitly + type: type: string type: object integration: @@ -298,6 +312,19 @@ spec: items: type: string type: array + errorHandler: + description: ErrorHandlerSpec respresents an integration error + handler to be used as default at runtime + properties: + configuration: + description: ErrorHandlerConfiguration -- + type: object + x-kubernetes-preserve-unknown-fields: true + type: + type: string + uri: + type: string + type: object flows: items: description: Flow is an unstructured object representing a Camel
