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 2023/03/02 07:42:07 UTC
[camel-k] 06/08: chore: Regen docs with ingress trait new options
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 af0a87235d95069f4b48977525e1e132dc02b8f9
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Wed Mar 1 12:46:56 2023 +0100
chore: Regen docs with ingress trait new options
---
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 24 +++++++++++++++++++++++
docs/modules/traits/pages/ingress.adoc | 15 ++++++++++++++
resources/traits.yaml | 11 +++++++++++
3 files changed, 50 insertions(+)
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 1b9414e5a..bf4937a00 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -4504,6 +4504,15 @@ It's enabled by default whenever a Service is added to the integration (through
+|`annotations` +
+map[string]string
+|
+
+
+The annotations added to the ingress.
+This can be used to set controller specific annotations, e.g., when using the NGINX Ingress controller:
+See https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md
+
|`host` +
string
|
@@ -4511,6 +4520,21 @@ string
To configure the host exposed by the ingress.
+|`path` +
+string
+|
+
+
+To configure the path exposed by the ingress (default `/`).
+
+|`pathType` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#pathtype-v1-networking[Kubernetes networking/v1.PathType]*
+|
+
+
+To configure the path type exposed by the ingress.
+One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`).
+
|`auto` +
bool
|
diff --git a/docs/modules/traits/pages/ingress.adoc b/docs/modules/traits/pages/ingress.adoc
index ae0f8c112..ed3a5abb5 100755
--- a/docs/modules/traits/pages/ingress.adoc
+++ b/docs/modules/traits/pages/ingress.adoc
@@ -28,10 +28,25 @@ The following configuration options are available:
| bool
| Can be used to enable or disable a trait. All traits share this common property.
+| ingress.annotations
+| map[string]string
+| The annotations added to the ingress.
+This can be used to set controller specific annotations, e.g., when using the NGINX Ingress controller:
+See https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md
+
| ingress.host
| string
| To configure the host exposed by the ingress.
+| ingress.path
+| string
+| To configure the path exposed by the ingress (default `/`).
+
+| ingress.path-type
+| k8s.io/api/networking/v1.PathType
+| To configure the path type exposed by the ingress.
+One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`).
+
| ingress.auto
| bool
| To automatically add an ingress whenever the integration uses an HTTP endpoint consumer.
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 697d8c523..f2a4d85f6 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -643,9 +643,20 @@ traits:
type: bool
description: Can be used to enable or disable a trait. All traits share this common
property.
+ - name: annotations
+ type: map[string]string
+ description: 'The annotations added to the ingress. This can be used to set controller
+ specific annotations, e.g., when using the NGINX Ingress controller: See https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md'
- name: host
type: string
description: To configure the host exposed by the ingress.
+ - name: path
+ type: string
+ description: To configure the path exposed by the ingress (default `/`).
+ - name: path-type
+ type: k8s.io/api/networking/v1.PathType
+ description: To configure the path type exposed by the ingress. One of `Exact`,
+ `Prefix`, `ImplementationSpecific` (default to `Prefix`).
- name: auto
type: bool
description: To automatically add an ingress whenever the integration uses an