This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d21735feb8022200197b00eaf02c34b97b064b12 Author: David Jencks <[email protected]> AuthorDate: Thu Apr 30 09:51:33 2020 -0700 deploy generated changes --- deploy/resources.go | 4 +-- deploy/traits.yaml | 70 +---------------------------------------------------- 2 files changed, 3 insertions(+), 71 deletions(-) diff --git a/deploy/resources.go b/deploy/resources.go index 454f878..73ccf3e 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -340,9 +340,9 @@ var assets = func() http.FileSystem { "/traits.yaml": &vfsgen۰CompressedFileInfo{ name: "traits.yaml", modTime: time.Time{}, - uncompressedSize: 31566, + uncompressedSize: 28816, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x7d\xed\x72\x1c\x37\x12\xd8\x7f\x3d\x05\x8a\x49\x15\x3f\x6a\x77\x28\xf9\xea\xce\x3e\x26\xca\x15\x23\xe9\xee\x68\x5b\x12\x23\xe9\xee\x92\xba\xb8\x6e\xb1\x33\xbd\xbb\x30\x31\xc0\x1c\x80\x21\xb5\x4e\xa5\x2a\xaf\x91\xd7\xcb\x93\xa4\xba\x1b\xc0\x60\x76\x97\xe4\x52\x36\x5d\xa6\xfd\x43\x5c\x72\xa6\xd1\x68\xf4\xf7\x07\x36\x38\xa9\x82\x3f\x7b\x36\x15\x46\xb6\x70\x26\xe4\x62\xa1\x8c\x0a\xeb\x67\x42\x74\x5a\x86\x85\x75\xed\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x7d\x6d\x6f\x1c\x37\x92\xf0\x77\xff\x0a\x42\xcf\x03\xe8\x05\x33\x2d\x39\x8b\xdd\x64\xf5\xc0\x08\xf4\x28\xce\xae\x9c\xd8\xd6\x59\x4e\xf6\x0e\xb9\x60\x87\xd3\x5d\x33\x4d\x8b\x4d\xf6\x92\xec\x91\x67\x0f\x07\xdc\xdf\xb8\xbf\x77\xbf\xe4\x50\xc5\x97\x66\xf7\x8c\xa4\x91\x1d\x05\x56\xf2\xc1\x9a\x51\x77\xb1\xaa\x58\xef\x55\xa4\x9c\xe1\xc2\xd9\xd3\x67\x53\xa6\x78\x03\xa7\x8c\x2f\x16\x42\x09\xb7\x7e\xc6\x58\x2b\xb9\x5b\x68\x [...] }, "/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{ name: "user-cluster-role.yaml", diff --git a/deploy/traits.yaml b/deploy/traits.yaml index 13d3319..9db71e0 100755 --- a/deploy/traits.yaml +++ b/deploy/traits.yaml @@ -288,7 +288,7 @@ traits: description: Can be used to enable or disable a trait. All traits share this common property. - name: discovery-cache - type: github.com/apache/camel-k/pkg/trait.discoveryCacheType + type: ./pkg/trait.discoveryCacheType description: Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`) - name: ingress @@ -518,45 +518,6 @@ traits: - name: auto type: bool description: Enable automatic discovery of all trait properties. -- name: master - platform: false - profiles: - - Kubernetes - - Knative - - OpenShift - description: 'The Master trait allows to configure the integration to automatically - leverage Kubernetes resources for doingleader election and starting *master* routes - only on certain instances.It''s activated automatically when using the master - endpoint in a route, e.g. `from("master:lockname:telegram:bots")...`.NOTE: this - trait adds special permissions to the integration service account in order to - read/write configmaps and read pods.It''s recommended to use a different service - account than "default" when running the integration.' - properties: - - name: enabled - type: bool - description: Can be used to enable or disable a trait. All traits share this common - property. - - name: auto - type: bool - description: Enables automatic configuration of the trait. - - name: include-delegate-dependencies - type: bool - description: When this flag is active, the operator analyzes the source code to - add dependencies required by delegate endpoints.E.g. when using `master:lockname:timer`, - then `camel:timer` is automatically added to the set of dependencies.It's enabled - by default. - - name: configmap - type: string - description: Name of the configmap that will be used to store the lock. Defaults - to "<integration-name>-lock". - - name: label-key - type: string - description: Label that will be used to identify all pods contending the lock. - Defaults to "camel.apache.org/integration". - - name: label-value - type: string - description: Label value that will be used to identify all pods contending the - lock. Defaults to the integration name. - name: openapi platform: true profiles: @@ -745,32 +706,3 @@ traits: - name: auto type: bool description: To automatically detect from the code if a Service needs to be created. -- name: 3scale - platform: false - profiles: - - Kubernetes - - Knative - - OpenShift - description: The 3scale trait can be used to automatically create annotations that - allow3scale to discover the generated service and make it available for API management.The - 3scale trait is disabled by default. - properties: - - name: enabled - type: bool - description: Can be used to enable or disable a trait. All traits share this common - property. - - name: auto - type: bool - description: Enables automatic configuration of the trait. - - name: scheme - type: string - description: The scheme to use to contact the service (default `http`) - - name: path - type: string - description: The path where the API is published (default `/`) - - name: port - type: int - description: The port where the service is exposed (default `80`) - - name: description-path - type: string - description: The path where the Open-API specification is published (default `/api-doc`)
