This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 112e61ca584f88f5f918a47d72db49faf903dc3b
Author: Mike Dobozy <mdob...@redhat.com>
AuthorDate: Mon Apr 27 05:10:48 2020 -0400
generated threescale and master for trait metadata.
---
addons/master/zz_desc_generated.go | 1 +
addons/threescale/zz_desc_generated.go | 1 +
deploy/traits.yaml | 68 ++++++++++++++++++++++++++++++
docs/modules/ROOT/nav.adoc | 2 +
docs/modules/ROOT/pages/traits/traits.adoc | 2 +
5 files changed, 74 insertions(+)
diff --git a/addons/master/zz_desc_generated.go
b/addons/master/zz_desc_generated.go
new file mode 100644
index 0000000..57d5fb2
--- /dev/null
+++ b/addons/master/zz_desc_generated.go
@@ -0,0 +1 @@
+package master
diff --git a/addons/threescale/zz_desc_generated.go
b/addons/threescale/zz_desc_generated.go
new file mode 100644
index 0000000..38eec99
--- /dev/null
+++ b/addons/threescale/zz_desc_generated.go
@@ -0,0 +1 @@
+package threescale
diff --git a/deploy/traits.yaml b/deploy/traits.yaml
index 70753eb..cb26871 100755
--- a/deploy/traits.yaml
+++ b/deploy/traits.yaml
@@ -518,6 +518,45 @@ 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:
@@ -706,3 +745,32 @@ 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`)
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 1f7374a..9d9daa5 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -16,6 +16,7 @@
** xref:configuration/configmap-secret.adoc[ConfigMap/Secret]
* xref:traits/traits.adoc[Traits]
// Start of autogenerated code - DO NOT EDIT! (trait-nav)
+** xref:traits/3scale.adoc[3scale]
** xref:traits/affinity.adoc[Affinity]
** xref:traits/builder.adoc[Builder]
** xref:traits/camel.adoc[Camel]
@@ -32,6 +33,7 @@
** xref:traits/jvm.adoc[Jvm]
** xref:traits/knative-service.adoc[Knative Service]
** xref:traits/knative.adoc[Knative]
+** xref:traits/master.adoc[Master]
** xref:traits/openapi.adoc[Openapi]
** xref:traits/owner.adoc[Owner]
** xref:traits/platform.adoc[Platform]
diff --git a/docs/modules/ROOT/pages/traits/traits.adoc
b/docs/modules/ROOT/pages/traits/traits.adoc
index cbe1d72..e2e663c 100644
--- a/docs/modules/ROOT/pages/traits/traits.adoc
+++ b/docs/modules/ROOT/pages/traits/traits.adoc
@@ -34,6 +34,7 @@ A trait may have additional properties that can be configured
by the end user.
See the trait description pages for more information on a specific trait:
// Start of autogenerated code - DO NOT EDIT! (trait-list)
+* xref:traits/3scale.adoc[3scale Trait]
* xref:traits/affinity.adoc[Affinity Trait]
* xref:traits/builder.adoc[Builder Trait]
* xref:traits/camel.adoc[Camel Trait]
@@ -50,6 +51,7 @@ See the trait description pages for more information on a
specific trait:
* xref:traits/jvm.adoc[Jvm Trait]
* xref:traits/knative-service.adoc[Knative Service Trait]
* xref:traits/knative.adoc[Knative Trait]
+* xref:traits/master.adoc[Master Trait]
* xref:traits/openapi.adoc[Openapi Trait]
* xref:traits/owner.adoc[Owner Trait]
* xref:traits/platform.adoc[Platform Trait]
