You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/08/17 08:06:16 UTC

[camel-k] branch main updated (4e51552 -> 8c11e07)

This is an automated email from the ASF dual-hosted git repository.

astefanutti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git.


    from 4e51552  Probably incorrect integration name
     new 411362b  Helm chart: improve configuration section
     new 8c11e07  Update integration-platform doc

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../architecture/cr/integration-platform.adoc      | 18 +++++++++-------
 helm/camel-k/README.md                             | 25 ++++++++++++----------
 2 files changed, 24 insertions(+), 19 deletions(-)

[camel-k] 02/02: Update integration-platform doc

Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 8c11e072acd05a482aecf70e7996281553fe701a
Author: Toon Albers <45...@users.noreply.github.com>
AuthorDate: Thu Jul 22 18:08:47 2021 +0200

    Update integration-platform doc
    
    Mention container registry for build spec, add kamelet repository spec
---
 .../pages/architecture/cr/integration-platform.adoc    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/modules/ROOT/pages/architecture/cr/integration-platform.adoc b/docs/modules/ROOT/pages/architecture/cr/integration-platform.adoc
index 8bb85b8..d6052e4 100644
--- a/docs/modules/ROOT/pages/architecture/cr/integration-platform.adoc
+++ b/docs/modules/ROOT/pages/architecture/cr/integration-platform.adoc
@@ -11,19 +11,21 @@ type IntegrationPlatform struct {
 }
 
 type IntegrationPlatformSpec struct {
-	Cluster       IntegrationPlatformCluster    // <3>
-	Profile       TraitProfile                  // <4>
-	Build         IntegrationPlatformBuildSpec  // <5>
-	Traits        map[string]TraitSpec          // <6>
-	Configuration []ConfigurationSpec           // <6>
+	Cluster       IntegrationPlatformCluster       // <3>
+	Profile       TraitProfile                     // <4>
+	Build         IntegrationPlatformBuildSpec     // <5>
+	Traits        map[string]TraitSpec             // <6>
+	Configuration []ConfigurationSpec              // <6>
+	Kamelet       []IntegrationPlatformKameletSpec // <7>
 }
 ----
 <1> The desired state
 <2> The status of the object at current time
 <3> The type of the Kubernetes Cluster (Kubernetes or OpenShift)
-<4> Configures the traits that have to be applied by default (Kubernetes, OpneShift, Knative)
-<5> Configuration options of the image build process such as the type of the builder (buildah, kanico, spectrum) and the maven repositories that have to be configured in order retrieve the artifacts needed by the integrations.
-<6> The traits and configuration options that have to be propagated to each integration.
+<4> Configures the traits that have to be applied by default (Kubernetes, OpenShift, Knative)
+<5> Configuration options of the image build process such as the type of the builder (buildah, kanico, spectrum), the container registry and the maven repositories that have to be configured in order retrieve the artifacts needed by the integrations.
+<6> The traits and configuration options (properties, secrets, configmaps) that have to be propagated to each integration.
+<7> Locations to look up Kamelet definitions
 
 [NOTE]
 ====

[camel-k] 01/02: Helm chart: improve configuration section

Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 411362b27cb575e4ec1913d517a791eeb2f74924
Author: Toon Albers <45...@users.noreply.github.com>
AuthorDate: Thu Jul 22 17:52:43 2021 +0200

    Helm chart: improve configuration section
---
 helm/camel-k/README.md | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/helm/camel-k/README.md b/helm/camel-k/README.md
index 0863076..e1bed17 100644
--- a/helm/camel-k/README.md
+++ b/helm/camel-k/README.md
@@ -69,21 +69,24 @@ The command removes all the Kubernetes resources installed.
 ## Configuration
 
 The following table lists the most commonly configured parameters of the
-CouchDB chart and their default values:
+Camel-K chart and their default values. The chart allows configuration of an `IntegrationPlatform` resource, which among others includes build properties and traits configuration. A full list of parameters can be found [in the operator specification][1].
 
-|           Parameter                |             Description                                     |                Default                 |
-|------------------------------------|-------------------------------------------------------------|----------------------------------------|
-| `platform.build.registry.address`  | The address of a container image registry to push images    |                                        |
-| `platform.build.registry.insecure` | Indicates if the registry is secured                        | true                                   |
-| `platform.cluster`                 | The kind of Kubernetes cluster (Kubernetes or OpenShift)    | `Kubernetes`                           |
-| `platform.profile`                 | The trait profile to use (Knative, Kubernetes or OpenShift) | auto                                   |
+|           Parameter                    |             Description                                                   |            Default             |
+|----------------------------------------|---------------------------------------------------------------------------|--------------------------------|
+| `platform.build.registry.address`      | The address of a container image registry to push images                  |                                |
+| `platform.build.registry.secret`       | A secret used to push/pull images to the Docker registry                  |                                |
+| `platform.build.registry.organization` | An organization on the Docker registry that can be used to publish images |                                |
+| `platform.build.registry.insecure`     | Indicates if the registry is not secured                                  | true                           |
+| `platform.cluster`                     | The kind of Kubernetes cluster (Kubernetes or OpenShift)                  | `Kubernetes`                   |
+| `platform.profile`                     | The trait profile to use (Knative, Kubernetes or OpenShift)               | auto                           |
 
 ## Contributing
 
 We'd like to hear your feedback and we love any kind of contribution!
 
-The main contact points for the Camel K project are the [GitHub repository][1]
-and the [Chat room][2].
+The main contact points for the Camel K project are the [GitHub repository][2]
+and the [Chat room][3].
 
-[1]: https://github.com/apache/camel-k
-[2]: https://camel.zulipchat.com
+[1]: https://camel.apache.org/camel-k/latest/architecture/cr/integration-platform.html
+[2]: https://github.com/apache/camel-k
+[3]: https://camel.zulipchat.com