This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit ea051aa12e8f94f8dea053b43de4a2c45d6c2fb5 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Apr 16 09:33:21 2021 +0200 CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and cluster should not clash with component --- .../src/main/docs/kubernetes-starter.adoc | 28 +++++++++++----------- .../KubernetesClusterServiceAutoConfiguration.java | 2 +- .../KubernetesClusterServiceConfiguration.java | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/components-starter/camel-kubernetes-starter/src/main/docs/kubernetes-starter.adoc b/components-starter/camel-kubernetes-starter/src/main/docs/kubernetes-starter.adoc index 134b7a9..4fbb8b7 100644 --- a/components-starter/camel-kubernetes-starter/src/main/docs/kubernetes-starter.adoc +++ b/components-starter/camel-kubernetes-starter/src/main/docs/kubernetes-starter.adoc @@ -24,6 +24,20 @@ The component supports 74 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *camel.cluster.kubernetes.attributes* | Custom service attributes. | | Map +| *camel.cluster.kubernetes.cluster-labels* | Set the labels used to identify the pods composing the cluster. | | Map +| *camel.cluster.kubernetes.config-map-name* | Set the name of the ConfigMap used to do optimistic locking (defaults to 'leaders'). | | String +| *camel.cluster.kubernetes.connection-timeout-millis* | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. | | Integer +| *camel.cluster.kubernetes.enabled* | Sets if the Kubernetes cluster service should be enabled or not, default is false. | false | Boolean +| *camel.cluster.kubernetes.id* | Cluster Service ID | | String +| *camel.cluster.kubernetes.jitter-factor* | A jitter factor to apply in order to prevent all pods to call Kubernetes APIs in the same instant. | | Double +| *camel.cluster.kubernetes.kubernetes-namespace* | Set the name of the Kubernetes namespace containing the pods and the configmap (autodetected by default) | | String +| *camel.cluster.kubernetes.lease-duration-millis* | The default duration of the lease for the current leader. | | Long +| *camel.cluster.kubernetes.master-url* | Set the URL of the Kubernetes master (read from Kubernetes client properties by default). | | String +| *camel.cluster.kubernetes.order* | Service lookup order/priority. | | Integer +| *camel.cluster.kubernetes.pod-name* | Set the name of the current pod (autodetected from container host name by default). | | String +| *camel.cluster.kubernetes.renew-deadline-millis* | The deadline after which the leader must stop its services because it may have lost the leadership. | | Long +| *camel.cluster.kubernetes.retry-period-millis* | The time between two subsequent attempts to check and acquire the leadership. It is randomized using the jitter factor. | | Long | *camel.component.kubernetes-config-maps.autowired-enabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | Boolean | *camel.component.kubernetes-config-maps.enabled* | Whether to enable auto configuration of the kubernetes-config-maps component. This is enabled by default. | | Boolean | *camel.component.kubernetes-config-maps.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message [...] @@ -78,20 +92,6 @@ The component supports 74 options, which are listed below. | *camel.component.kubernetes-services.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean | *camel.component.kubernetes-services.enabled* | Whether to enable auto configuration of the kubernetes-services component. This is enabled by default. | | Boolean | *camel.component.kubernetes-services.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is [...] -| *camel.component.kubernetes.cluster.service.attributes* | Custom service attributes. | | Map -| *camel.component.kubernetes.cluster.service.cluster-labels* | Set the labels used to identify the pods composing the cluster. | | Map -| *camel.component.kubernetes.cluster.service.config-map-name* | Set the name of the ConfigMap used to do optimistic locking (defaults to 'leaders'). | | String -| *camel.component.kubernetes.cluster.service.connection-timeout-millis* | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. | | Integer -| *camel.component.kubernetes.cluster.service.enabled* | Sets if the Kubernetes cluster service should be enabled or not, default is false. | false | Boolean -| *camel.component.kubernetes.cluster.service.id* | Cluster Service ID | | String -| *camel.component.kubernetes.cluster.service.jitter-factor* | A jitter factor to apply in order to prevent all pods to call Kubernetes APIs in the same instant. | | Double -| *camel.component.kubernetes.cluster.service.kubernetes-namespace* | Set the name of the Kubernetes namespace containing the pods and the configmap (autodetected by default) | | String -| *camel.component.kubernetes.cluster.service.lease-duration-millis* | The default duration of the lease for the current leader. | | Long -| *camel.component.kubernetes.cluster.service.master-url* | Set the URL of the Kubernetes master (read from Kubernetes client properties by default). | | String -| *camel.component.kubernetes.cluster.service.order* | Service lookup order/priority. | | Integer -| *camel.component.kubernetes.cluster.service.pod-name* | Set the name of the current pod (autodetected from container host name by default). | | String -| *camel.component.kubernetes.cluster.service.renew-deadline-millis* | The deadline after which the leader must stop its services because it may have lost the leadership. | | Long -| *camel.component.kubernetes.cluster.service.retry-period-millis* | The time between two subsequent attempts to check and acquire the leadership. It is randomized using the jitter factor. | | Long | *camel.component.openshift-build-configs.autowired-enabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | Boolean | *camel.component.openshift-build-configs.enabled* | Whether to enable auto configuration of the openshift-build-configs component. This is enabled by default. | | Boolean | *camel.component.openshift-build-configs.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message [...] diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java index ca7b960..6eb6a8a 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Scope; @Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class }) -@ConditionalOnProperty(prefix = "camel.component.kubernetes.cluster.service", name = "enabled") +@ConditionalOnProperty(prefix = "camel.cluster.kubernetes", name = "enabled") @EnableConfigurationProperties(KubernetesClusterServiceConfiguration.class) public class KubernetesClusterServiceAutoConfiguration { @Autowired diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java index 6e9d2d4..c5cbe9e 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java @@ -20,7 +20,7 @@ import java.util.Map; import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "camel.component.kubernetes.cluster.service") +@ConfigurationProperties(prefix = "camel.cluster.kubernetes") public class KubernetesClusterServiceConfiguration { /**
