You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/11/29 12:00:11 UTC
[camel-k] branch fix-doc-port-name created (now dc4c2ce)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch fix-doc-port-name
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
at dc4c2ce Regen documentation
This branch includes the following new commits:
new 265ffd1 Default value of trait container.port-name is missing from catalog
new dc4c2ce Regen documentation
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.
[camel-k] 02/02: Regen documentation
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch fix-doc-port-name
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit dc4c2ce92e129fd4538b42df8cafaab47d6d1039
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 29 12:58:55 2021 +0100
Regen documentation
---
docs/modules/traits/pages/container.adoc | 2 +-
docs/modules/traits/pages/gc.adoc | 2 +-
docs/modules/traits/pages/quarkus.adoc | 2 +-
resources/traits.yaml | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/modules/traits/pages/container.adoc b/docs/modules/traits/pages/container.adoc
index a214ccf..2618a64 100755
--- a/docs/modules/traits/pages/container.adoc
+++ b/docs/modules/traits/pages/container.adoc
@@ -60,7 +60,7 @@ The following configuration options are available:
| container.port-name
| string
-| To configure a different port name for the port exposed by the container (default `http`).
+| To configure a different port name for the port exposed by the container. it defaults to `http` only when the `expose` parameter is true.
| container.service-port
| int
diff --git a/docs/modules/traits/pages/gc.adoc b/docs/modules/traits/pages/gc.adoc
index 375057d..c7a9ee8 100755
--- a/docs/modules/traits/pages/gc.adoc
+++ b/docs/modules/traits/pages/gc.adoc
@@ -26,7 +26,7 @@ The following configuration options are available:
| Can be used to enable or disable a trait. All traits share this common property.
| gc.discovery-cache
-| ./pkg/trait.discoveryCacheType
+| github.com/apache/camel-k/pkg/trait.discoveryCacheType
| Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`)
|===
diff --git a/docs/modules/traits/pages/quarkus.adoc b/docs/modules/traits/pages/quarkus.adoc
index 0ddf3ef..e9d579e 100755
--- a/docs/modules/traits/pages/quarkus.adoc
+++ b/docs/modules/traits/pages/quarkus.adoc
@@ -36,7 +36,7 @@ The following configuration options are available:
| Can be used to enable or disable a trait. All traits share this common property.
| quarkus.package-type
-| []./pkg/trait.quarkusPackageType
+| []github.com/apache/camel-k/pkg/trait.quarkusPackageType
| The Quarkus package types, either `fast-jar` or `native` (default `fast-jar`).
In case both `fast-jar` and `native` are specified, two `IntegrationKit` resources are created,
with the `native` kit having precedence over the `fast-jar` one once ready.
diff --git a/resources/traits.yaml b/resources/traits.yaml
index a19f164..f1fea59 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -113,8 +113,8 @@ traits:
description: To configure a different port exposed by the container (default `8080`).
- name: port-name
type: string
- description: To configure a different port name for the port exposed by the container
- (default `http`).
+ description: To configure a different port name for the port exposed by the container.
+ it defaults to `http` only when the `expose` parameter is true.
- name: service-port
type: int
description: To configure under which service port the container port is to be
@@ -349,7 +349,7 @@ traits:
description: Can be used to enable or disable a trait. All traits share this common
property.
- name: discovery-cache
- type: ./pkg/trait.discoveryCacheType
+ type: github.com/apache/camel-k/pkg/trait.discoveryCacheType
description: Discovery client cache to be used, either `disabled`, `disk` or `memory`
(default `memory`)
- name: health
@@ -919,7 +919,7 @@ traits:
description: Can be used to enable or disable a trait. All traits share this common
property.
- name: package-type
- type: '[]./pkg/trait.quarkusPackageType'
+ type: '[]github.com/apache/camel-k/pkg/trait.quarkusPackageType'
description: The Quarkus package types, either `fast-jar` or `native` (default
`fast-jar`).In case both `fast-jar` and `native` are specified, two `IntegrationKit`
resources are created,with the `native` kit having precedence over the `fast-jar`
[camel-k] 01/02: Default value of trait container.port-name is missing from catalog
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch fix-doc-port-name
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 265ffd1e99300fa07216775c135f8237327b7e7d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 29 12:49:31 2021 +0100
Default value of trait container.port-name is missing from catalog
---
pkg/trait/container.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index 7ae6164..cefacf8 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -68,7 +68,7 @@ type containerTrait struct {
Expose *bool `property:"expose" json:"expose,omitempty"`
// To configure a different port exposed by the container (default `8080`).
Port int `property:"port" json:"port,omitempty"`
- // To configure a different port name for the port exposed by the container (default `http`).
+ // To configure a different port name for the port exposed by the container. it defaults to `http` only when the `expose` parameter is true.
PortName string `property:"port-name" json:"portName,omitempty"`
// To configure under which service port the container port is to be exposed (default `80`).
ServicePort int `property:"service-port" json:"servicePort,omitempty"`