[camel] branch camel-2.x updated (d11e46e -> f7d57ba)

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch camel-2.x updated (d11e46e -> f7d57ba)

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

acosentino pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from d11e46e  CAMEL-13886: Add integration test to camel-servlet-starter
     new 9b1b0cc  CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component
     new a608abd  CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, added test
     new c18c06e  CAMEL-13978 - Docs
     new 20a6b71  CAMEL-13978 - Fixed CS
     new 3e1fdd2  CAMEL-13978 - Fixed backport and doc regen
     new f7d57ba  Regen docs

The 6 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:
 .../src/main/docs/kubernetes-component.adoc        |  9 +--
 .../docs/kubernetes-config-maps-component.adoc     | 12 ++--
 .../docs/kubernetes-deployments-component.adoc     | 11 +--
 .../src/main/docs/kubernetes-hpa-component.adoc    | 11 +--
 .../src/main/docs/kubernetes-job-component.adoc    | 11 +--
 .../main/docs/kubernetes-namespaces-component.adoc | 11 +--
 .../src/main/docs/kubernetes-nodes-component.adoc  | 11 +--
 ...rnetes-persistent-volumes-claims-component.adoc | 11 +--
 .../kubernetes-persistent-volumes-component.adoc   | 11 +--
 .../src/main/docs/kubernetes-pods-component.adoc   | 11 +--
 ...bernetes-replication-controllers-component.adoc | 11 +--
 .../docs/kubernetes-resources-quota-component.adoc | 11 +--
 .../main/docs/kubernetes-secrets-component.adoc    | 11 +--
 .../kubernetes-service-accounts-component.adoc     | 11 +--
 .../main/docs/kubernetes-services-component.adoc   | 11 +--
 .../docs/openshift-build-configs-component.adoc    |  9 +--
 .../src/main/docs/openshift-builds-component.adoc  | 11 +--
 .../KubernetesConfigMapsConsumer.java}             | 65 +++++++++---------
 .../config_maps/KubernetesConfigMapsEndpoint.java  |  2 +-
 .../{ServiceEvent.java => ConfigMapEvent.java}     | 20 +++---
 ....java => KubernetesConfigMapsConsumerTest.java} | 78 ++++++----------------
 .../modules/ROOT/pages/kubernetes-component.adoc   | 10 +--
 .../pages/kubernetes-config-maps-component.adoc    | 13 ++--
 .../pages/kubernetes-deployments-component.adoc    | 12 ++--
 .../ROOT/pages/kubernetes-hpa-component.adoc       | 12 ++--
 .../ROOT/pages/kubernetes-job-component.adoc       | 12 ++--
 .../pages/kubernetes-namespaces-component.adoc     | 12 ++--
 .../ROOT/pages/kubernetes-nodes-component.adoc     | 12 ++--
 ...rnetes-persistent-volumes-claims-component.adoc | 12 ++--
 .../kubernetes-persistent-volumes-component.adoc   | 12 ++--
 .../ROOT/pages/kubernetes-pods-component.adoc      | 12 ++--
 ...bernetes-replication-controllers-component.adoc | 12 ++--
 .../kubernetes-resources-quota-component.adoc      | 12 ++--
 .../ROOT/pages/kubernetes-secrets-component.adoc   | 12 ++--
 .../kubernetes-service-accounts-component.adoc     | 12 ++--
 .../ROOT/pages/kubernetes-services-component.adoc  | 12 ++--
 .../pages/openshift-build-configs-component.adoc   | 10 +--
 .../ROOT/pages/openshift-builds-component.adoc     | 12 ++--
 .../modules/ROOT/pages/sql-component.adoc          | 48 ++++++++++++-
 39 files changed, 309 insertions(+), 289 deletions(-)
 copy components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/{nodes/KubernetesNodesConsumer.java => config_maps/KubernetesConfigMapsConsumer.java} (69%)
 copy components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/{ServiceEvent.java => ConfigMapEvent.java} (77%)
 copy components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/{KubernetesPodsConsumerTest.java => KubernetesConfigMapsConsumerTest.java} (52%)

Reply | Threaded
Open this post in threaded view
|

[camel] 01/06: CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component

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

acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 9b1b0ccd0dd5cfd10001d7da2fe6a6691945a9d2
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Sep 16 08:49:26 2019 +0200

    CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component
---
 .../config_maps/KubernetesConfigMapsConsumer.java  | 132 +++++++++++++++++++++
 .../config_maps/KubernetesConfigMapsEndpoint.java  |   2 +-
 .../kubernetes/consumer/common/ConfigMapEvent.java |  47 ++++++++
 3 files changed, 180 insertions(+), 1 deletion(-)

diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
new file mode 100644
index 0000000..bbc489e
--- /dev/null
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.kubernetes.config_maps;
+
+import java.util.concurrent.ExecutorService;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
+import org.apache.camel.component.kubernetes.KubernetesConstants;
+import org.apache.camel.component.kubernetes.consumer.common.ConfigMapEvent;
+import org.apache.camel.support.DefaultConsumer;
+import org.apache.camel.util.ObjectHelper;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapList;
+import io.fabric8.kubernetes.api.model.DoneableConfigMap;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.Watch;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
+import io.fabric8.kubernetes.client.dsl.Resource;
+
+public class KubernetesConfigMapsConsumer extends DefaultConsumer {
+
+    private final Processor processor;
+    private ExecutorService executor;
+    private ConfigMapsConsumerTask configMapWatcher;
+
+    public KubernetesConfigMapsConsumer(AbstractKubernetesEndpoint endpoint, Processor processor) {
+        super(endpoint, processor);
+        this.processor = processor;
+    }
+
+    @Override
+    public AbstractKubernetesEndpoint getEndpoint() {
+        return (AbstractKubernetesEndpoint)super.getEndpoint();
+    }
+
+    @Override
+    protected void doStart() throws Exception {
+        super.doStart();
+        executor = getEndpoint().createExecutor();
+
+        configMapWatcher = new ConfigMapsConsumerTask();
+        executor.submit(configMapWatcher);
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        super.doStop();
+
+        log.debug("Stopping Kubernetes ConfigMap Consumer");
+        if (executor != null) {
+            if (getEndpoint() != null && getEndpoint().getCamelContext() != null) {
+                if (configMapWatcher != null) {
+                    configMapWatcher.getWatch().close();
+                }
+                getEndpoint().getCamelContext().getExecutorServiceManager().shutdownNow(executor);
+            } else {
+                if (configMapWatcher != null) {
+                    configMapWatcher.getWatch().close();
+                }
+                executor.shutdownNow();
+            }
+        }
+        executor = null;
+    }
+
+    class ConfigMapsConsumerTask implements Runnable {
+
+        private Watch watch;
+
+        @Override
+        public void run() {
+            NonNamespaceOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> w = getEndpoint().getKubernetesClient().configMaps();
+            if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
+                && ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue())) {
+                w.withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(), getEndpoint().getKubernetesConfiguration().getLabelValue());
+            }
+            if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getResourceName())) {
+                w.withName(getEndpoint().getKubernetesConfiguration().getResourceName());
+            }
+            watch = w.watch(new Watcher<ConfigMap>() {
+
+                @Override
+                public void eventReceived(io.fabric8.kubernetes.client.Watcher.Action action, ConfigMap resource) {
+                    ConfigMapEvent de = new ConfigMapEvent(action, resource);
+                    Exchange exchange = getEndpoint().createExchange();
+                    exchange.getIn().setBody(de.getConfigMap());
+                    exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, de.getAction());
+                    exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis());
+                    try {
+                        processor.process(exchange);
+                    } catch (Exception e) {
+                        getExceptionHandler().handleException("Error during processing", exchange, e);
+                    }
+                }
+
+                @Override
+                public void onClose(KubernetesClientException cause) {
+                    if (cause != null) {
+                        log.error(cause.getMessage(), cause);
+                    }
+
+                }
+            });
+        }
+
+        public Watch getWatch() {
+            return watch;
+        }
+
+        public void setWatch(Watch watch) {
+            this.watch = watch;
+        }
+    }
+}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
index 5a921de..035e8b4 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
@@ -45,7 +45,7 @@ public class KubernetesConfigMapsEndpoint extends AbstractKubernetesEndpoint {
 
     @Override
     public Consumer createConsumer(Processor processor) throws Exception {
-        throw new IllegalArgumentException("The kubernetes-configmaps doesn't support consumer");
+        return new KubernetesConfigMapsConsumer(this, processor);
     }
 
 }
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/ConfigMapEvent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/ConfigMapEvent.java
new file mode 100644
index 0000000..d225219
--- /dev/null
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/ConfigMapEvent.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.kubernetes.consumer.common;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.client.Watcher.Action;
+
+public class ConfigMapEvent {
+    private io.fabric8.kubernetes.client.Watcher.Action action;
+
+    private ConfigMap configMap;
+
+    public ConfigMapEvent(Action action, ConfigMap configMap) {
+        this.action = action;
+        this.configMap = configMap;
+    }
+
+    public io.fabric8.kubernetes.client.Watcher.Action getAction() {
+        return action;
+    }
+
+    public void setAction(io.fabric8.kubernetes.client.Watcher.Action action) {
+        this.action = action;
+    }
+
+    public ConfigMap getConfigMap() {
+        return configMap;
+    }
+
+    public void setConfigMap(ConfigMap configMap) {
+        this.configMap = configMap;
+    }
+}

Reply | Threaded
Open this post in threaded view
|

[camel] 02/06: CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, added test

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a608abdd7bb976888fccabb33728b941ade94814
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Sep 16 08:48:32 2019 +0200

    CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, added test
---
 .../consumer/KubernetesConfigMapsConsumerTest.java | 104 +++++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
new file mode 100644
index 0000000..3bd59af
--- /dev/null
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.kubernetes.consumer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.kubernetes.KubernetesConstants;
+import org.apache.camel.component.kubernetes.KubernetesTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.ObjectHelper;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+
+@Ignore("Requires a running Kubernetes Cluster")
+public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
+
+    @EndpointInject("mock:result")
+    protected MockEndpoint mockResultEndpoint;
+
+    @Test
+    public void createAndDeleteConfigMap() throws Exception {
+        if (ObjectHelper.isEmpty(authToken)) {
+            return;
+        }
+
+        mockResultEndpoint.expectedMessageCount(3);
+        mockResultEndpoint.expectedHeaderValuesReceivedInAnyOrder(KubernetesConstants.KUBERNETES_EVENT_ACTION, "ADDED", "MODIFIED", "MODIFIED");
+        Exchange ex = template.request("direct:createConfigmap", new Processor() {
+
+            @Override
+            public void process(Exchange exchange) throws Exception {
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default");
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, "test");
+                Map<String, String> labels = new HashMap<>();
+                labels.put("this", "rocks");
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, labels);
+                HashMap<String, String> configMapData = new HashMap<>();
+                configMapData.put("test", "test");
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_DATA, configMapData);
+            }
+        });
+
+        ex = template.request("direct:deleteConfigmap", new Processor() {
+
+            @Override
+            public void process(Exchange exchange) throws Exception {
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default");
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, "test");
+            }
+        });
+
+        boolean cmDeleted = ex.getOut().getBody(Boolean.class);
+
+        assertTrue(cmDeleted);
+
+        Thread.sleep(3000);
+
+        mockResultEndpoint.assertIsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:createConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=createConfigMap", host, authToken);
+                from("direct:deleteConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=deleteConfigMap", host, authToken);
+                fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=myproject&labelKey=this&labelValue=rocks", host, authToken).process(new KubernertesProcessor())
+                    .to(mockResultEndpoint);
+            }
+        };
+    }
+
+    public class KubernertesProcessor implements Processor {
+        @Override
+        public void process(Exchange exchange) throws Exception {
+            Message in = exchange.getIn();
+            ConfigMap cm = exchange.getIn().getBody(ConfigMap.class);
+            log.info("Got event with configmap name: " + cm.getMetadata().getName() + " and action " + in.getHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION));
+        }
+    }
+}

Reply | Threaded
Open this post in threaded view
|

[camel] 03/06: CAMEL-13978 - Docs

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit c18c06e48e800e1da7cbc338d26e8c6a1344084b
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Sep 16 08:51:55 2019 +0200

    CAMEL-13978 - Docs
---
 .../src/main/docs/kubernetes-config-maps-component.adoc              | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
index a665668..2b782da 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
@@ -3,9 +3,8 @@
 
 *Available as of Camel version 2.17*
 
-
 The *Kubernetes ConfigMap* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
-provides a producer to execute kubernetes ConfigMap operations.
+provides a producer to execute kubernetes ConfigMap operations and a consumer to consume events related to Config maps.
 
 
 == Component Options
@@ -90,4 +89,4 @@ The component supports 2 options, which are listed below.
 | *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.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END

Reply | Threaded
Open this post in threaded view
|

[camel] 04/06: CAMEL-13978 - Fixed CS

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 20a6b710efc4f5b2c0a7003bbfac7d4f7ad0b000
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Sep 16 08:55:46 2019 +0200

    CAMEL-13978 - Fixed CS
---
 .../config_maps/KubernetesConfigMapsConsumer.java        | 16 ++++++++--------
 .../consumer/KubernetesConfigMapsConsumerTest.java       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
index bbc489e..f8b4e80 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -18,14 +18,6 @@ package org.apache.camel.component.kubernetes.config_maps;
 
 import java.util.concurrent.ExecutorService;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
-import org.apache.camel.component.kubernetes.KubernetesConstants;
-import org.apache.camel.component.kubernetes.consumer.common.ConfigMapEvent;
-import org.apache.camel.support.DefaultConsumer;
-import org.apache.camel.util.ObjectHelper;
-
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapList;
 import io.fabric8.kubernetes.api.model.DoneableConfigMap;
@@ -35,6 +27,14 @@ import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
+import org.apache.camel.component.kubernetes.KubernetesConstants;
+import org.apache.camel.component.kubernetes.consumer.common.ConfigMapEvent;
+import org.apache.camel.support.DefaultConsumer;
+import org.apache.camel.util.ObjectHelper;
+
 public class KubernetesConfigMapsConsumer extends DefaultConsumer {
 
     private final Processor processor;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
index 3bd59af..0a53a0e 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.kubernetes.consumer;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.fabric8.kubernetes.api.model.ConfigMap;
+
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -31,8 +33,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import io.fabric8.kubernetes.api.model.ConfigMap;
-
 @Ignore("Requires a running Kubernetes Cluster")
 public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
 

Reply | Threaded
Open this post in threaded view
|

[camel] 05/06: CAMEL-13978 - Fixed backport and doc regen

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 3e1fdd2fa58da3422ef4f4764b186e347d02dfbb
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Sep 16 09:04:17 2019 +0200

    CAMEL-13978 - Fixed backport and doc regen
---
 .../camel-kubernetes/src/main/docs/kubernetes-component.adoc  |  9 +++++----
 .../src/main/docs/kubernetes-config-maps-component.adoc       |  9 +++++----
 .../src/main/docs/kubernetes-deployments-component.adoc       | 11 ++++++-----
 .../src/main/docs/kubernetes-hpa-component.adoc               | 11 ++++++-----
 .../src/main/docs/kubernetes-job-component.adoc               | 11 ++++++-----
 .../src/main/docs/kubernetes-namespaces-component.adoc        | 11 ++++++-----
 .../src/main/docs/kubernetes-nodes-component.adoc             | 11 ++++++-----
 .../docs/kubernetes-persistent-volumes-claims-component.adoc  | 11 ++++++-----
 .../main/docs/kubernetes-persistent-volumes-component.adoc    | 11 ++++++-----
 .../src/main/docs/kubernetes-pods-component.adoc              | 11 ++++++-----
 .../docs/kubernetes-replication-controllers-component.adoc    | 11 ++++++-----
 .../src/main/docs/kubernetes-resources-quota-component.adoc   | 11 ++++++-----
 .../src/main/docs/kubernetes-secrets-component.adoc           | 11 ++++++-----
 .../src/main/docs/kubernetes-service-accounts-component.adoc  | 11 ++++++-----
 .../src/main/docs/kubernetes-services-component.adoc          | 11 ++++++-----
 .../src/main/docs/openshift-build-configs-component.adoc      |  9 +++++----
 .../src/main/docs/openshift-builds-component.adoc             | 11 ++++++-----
 .../kubernetes/config_maps/KubernetesConfigMapsConsumer.java  |  2 +-
 .../kubernetes/consumer/KubernetesConfigMapsConsumerTest.java |  2 +-
 19 files changed, 101 insertions(+), 84 deletions(-)

diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
index b1a6fcb..7f3db07 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-component]]
-= Kubernetes Component (deprecated)
+== Kubernetes Component (deprecated)
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 [IMPORTANT]
@@ -74,7 +75,7 @@ kubernetes:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -84,7 +85,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (29 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
index 2b782da..3274ac5 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-config-maps-component]]
-= Kubernetes ConfigMap Component
+== Kubernetes ConfigMap Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 The *Kubernetes ConfigMap* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes ConfigMap operations and a consumer to consume events related to Config maps.
@@ -25,7 +26,7 @@ kubernetes-config-maps:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -35,7 +36,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
index d8b91f0..b1b97b4 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-deployments-component]]
-= Kubernetes Deployments Component
+== Kubernetes Deployments Component
 
 *Available as of Camel version 2.20*
+*Available as of Camel version 2.20*
+
 
 
 The *Kubernetes Deployments* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -27,7 +28,7 @@ kubernetes-deployments:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -99,4 +100,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-deployments.enabled* | Whether to enable auto configuration of the kubernetes-deployments component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-deployments.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
index 331986b..03b0636 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-hpa-component]]
-= Kubernetes HPA Component
+== Kubernetes HPA Component
 
 *Available as of Camel version 2.23*
+*Available as of Camel version 2.23*
+
 
 
 The *Kubernetes HPA* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +29,7 @@ kubernetes-hpa:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-hpa.enabled* | Whether to enable auto configuration of the kubernetes-hpa component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-hpa.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
index 7ca8d5c..beca5ca 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-job-component]]
-= Kubernetes Job Component
+== Kubernetes Job Component
 
 *Available as of Camel version 2.23*
+*Available as of Camel version 2.23*
+
 
 
 The *Kubernetes Job* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -27,7 +28,7 @@ kubernetes-job:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -99,4 +100,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-job.enabled* | Whether to enable auto configuration of the kubernetes-job component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-job.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
index 7ea063d..b419929 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-namespaces-component]]
-= Kubernetes Namespaces Component
+== Kubernetes Namespaces Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Namespaces* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +29,7 @@ kubernetes-namespaces:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-namespaces.enabled* | Whether to enable auto configuration of the kubernetes-namespaces component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-namespaces.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
index 6433d59..e427260 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-nodes-component]]
-= Kubernetes Nodes Component
+== Kubernetes Nodes Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Nodes* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +29,7 @@ kubernetes-nodes:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-nodes.enabled* | Whether to enable auto configuration of the kubernetes-nodes component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-nodes.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
index 6bf57a8..fa815cd 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-persistent-volumes-claims-component]]
-= Kubernetes Persistent Volume Claim Component
+== Kubernetes Persistent Volume Claim Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Persistent Volume Claim* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -27,7 +28,7 @@ kubernetes-persistent-volumes-claims:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,4 +92,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-persistent-volumes-claims.enabled* | Whether to enable auto configuration of the kubernetes-persistent-volumes-claims component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-persistent-volumes-claims.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
index cb17c94..9b8796b 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-persistent-volumes-component]]
-= Kubernetes Persistent Volume Component
+== Kubernetes Persistent Volume Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Persistent Volume* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -27,7 +28,7 @@ kubernetes-persistent-volumes:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,4 +92,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-persistent-volumes.enabled* | Whether to enable auto configuration of the kubernetes-persistent-volumes component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-persistent-volumes.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
index ae57ef2..eaa61f3 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-pods-component]]
-= Kubernetes Pods Component
+== Kubernetes Pods Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Pods* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -27,7 +28,7 @@ kubernetes-pods:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -99,4 +100,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-pods.enabled* | Whether to enable auto configuration of the kubernetes-pods component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-pods.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
index 1f784fa..0509ed2 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-replication-controllers-component]]
-= Kubernetes Replication Controller Component
+== Kubernetes Replication Controller Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Replication Controller* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +29,7 @@ kubernetes-replication-controllers:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-replication-controllers.enabled* | Whether to enable auto configuration of the kubernetes-replication-controllers component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-replication-controllers.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
index db21ce6..185ec20 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-resources-quota-component]]
-= Kubernetes Resources Quota Component
+== Kubernetes Resources Quota Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Resources Quota* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -27,7 +28,7 @@ kubernetes-resources-quota:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,4 +92,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-resources-quota.enabled* | Whether to enable auto configuration of the kubernetes-resources-quota component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-resources-quota.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
index 9f9f32d..f94b206 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-secrets-component]]
-= Kubernetes Secrets Component
+== Kubernetes Secrets Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Secrets* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -27,7 +28,7 @@ kubernetes-secrets:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,4 +92,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-secrets.enabled* | Whether to enable auto configuration of the kubernetes-secrets component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-secrets.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
index 1997320..f672c2a 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-service-accounts-component]]
-= Kubernetes Service Account Component
+== Kubernetes Service Account Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Service Account* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -25,7 +26,7 @@ kubernetes-service-accounts:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -35,7 +36,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -89,4 +90,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-service-accounts.enabled* | Whether to enable auto configuration of the kubernetes-service-accounts component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-service-accounts.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
index ecaa61a..3a4bab5 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
@@ -1,7 +1,8 @@
-[[kubernetes-services-component]]
-= Kubernetes Services Component
+== Kubernetes Services Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Services* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +29,7 @@ kubernetes-services:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *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.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc b/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
index e007064..385d2ff 100644
--- a/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
@@ -1,7 +1,8 @@
-[[openshift-build-configs-component]]
-= Openshift Build Config Component
+== Openshift Build Config Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *OpenShift Build Config* component is one of xref:kubernetes.adoc[Kubernetes Components] which
@@ -26,7 +27,7 @@ openshift-build-configs:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -36,7 +37,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
diff --git a/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc b/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
index 7acb798..13782aa 100644
--- a/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
@@ -1,7 +1,8 @@
-[[openshift-builds-component]]
-= Openshift Builds Component
+== Openshift Builds Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Builds* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -26,7 +27,7 @@ openshift-builds:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -36,7 +37,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -63,4 +64,4 @@ with the following path and query parameters:
 | *trustCerts* (security) | Define if the certs we used are trusted anyway or not |  | Boolean
 | *username* (security) | Username to connect to Kubernetes |  | String
 |===
-// endpoint options: END
\ No newline at end of file
+// endpoint options: END
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
index f8b4e80..c93a708 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -32,7 +32,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConstants;
 import org.apache.camel.component.kubernetes.consumer.common.ConfigMapEvent;
-import org.apache.camel.support.DefaultConsumer;
+import org.apache.camel.impl.DefaultConsumer;
 import org.apache.camel.util.ObjectHelper;
 
 public class KubernetesConfigMapsConsumer extends DefaultConsumer {
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
index 0a53a0e..60ce676 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 @Ignore("Requires a running Kubernetes Cluster")
 public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
 
-    @EndpointInject("mock:result")
+    @EndpointInject(uri = "mock:result")
     protected MockEndpoint mockResultEndpoint;
 
     @Test

Reply | Threaded
Open this post in threaded view
|

[camel] 06/06: Regen docs

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit f7d57badd9b57375c13ecd391318d705239542ed
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Sep 16 09:07:02 2019 +0200

    Regen docs
---
 .../modules/ROOT/pages/kubernetes-component.adoc   | 10 ++---
 .../pages/kubernetes-config-maps-component.adoc    | 13 +++---
 .../pages/kubernetes-deployments-component.adoc    | 12 +++---
 .../ROOT/pages/kubernetes-hpa-component.adoc       | 12 +++---
 .../ROOT/pages/kubernetes-job-component.adoc       | 12 +++---
 .../pages/kubernetes-namespaces-component.adoc     | 12 +++---
 .../ROOT/pages/kubernetes-nodes-component.adoc     | 12 +++---
 ...rnetes-persistent-volumes-claims-component.adoc | 12 +++---
 .../kubernetes-persistent-volumes-component.adoc   | 12 +++---
 .../ROOT/pages/kubernetes-pods-component.adoc      | 12 +++---
 ...bernetes-replication-controllers-component.adoc | 12 +++---
 .../kubernetes-resources-quota-component.adoc      | 12 +++---
 .../ROOT/pages/kubernetes-secrets-component.adoc   | 12 +++---
 .../kubernetes-service-accounts-component.adoc     | 12 +++---
 .../ROOT/pages/kubernetes-services-component.adoc  | 12 +++---
 .../pages/openshift-build-configs-component.adoc   | 10 ++---
 .../ROOT/pages/openshift-builds-component.adoc     | 12 +++---
 .../modules/ROOT/pages/sql-component.adoc          | 48 +++++++++++++++++++++-
 18 files changed, 146 insertions(+), 103 deletions(-)

diff --git a/docs/components/modules/ROOT/pages/kubernetes-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-component.adoc
index f57c21d..7f3db07 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-component]]
-= Kubernetes Component (deprecated)
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
+== Kubernetes Component (deprecated)
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 [IMPORTANT]
@@ -75,7 +75,7 @@ kubernetes:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -85,7 +85,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (29 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
diff --git a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc
index 303b9fb..3274ac5 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc
@@ -1,12 +1,11 @@
-[[kubernetes-config-maps-component]]
-= Kubernetes ConfigMap Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
+== Kubernetes ConfigMap Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
 
 
 The *Kubernetes ConfigMap* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
-provides a producer to execute kubernetes ConfigMap operations.
+provides a producer to execute kubernetes ConfigMap operations and a consumer to consume events related to Config maps.
 
 
 == Component Options
@@ -27,7 +26,7 @@ kubernetes-config-maps:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +36,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,4 +90,4 @@ The component supports 2 options, which are listed below.
 | *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.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc
index 9dc2f7c..b1b97b4 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-deployments-component]]
-= Kubernetes Deployments Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
+== Kubernetes Deployments Component
 
 *Available as of Camel version 2.20*
+*Available as of Camel version 2.20*
+
 
 
 The *Kubernetes Deployments* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-deployments:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +100,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-deployments.enabled* | Whether to enable auto configuration of the kubernetes-deployments component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-deployments.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc
index 81980f6..03b0636 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-hpa-component]]
-= Kubernetes HPA Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
+== Kubernetes HPA Component
 
 *Available as of Camel version 2.23*
+*Available as of Camel version 2.23*
+
 
 
 The *Kubernetes HPA* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-hpa:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-hpa.enabled* | Whether to enable auto configuration of the kubernetes-hpa component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-hpa.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc
index 9fbaec6..beca5ca 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-job-component]]
-= Kubernetes Job Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
+== Kubernetes Job Component
 
 *Available as of Camel version 2.23*
+*Available as of Camel version 2.23*
+
 
 
 The *Kubernetes Job* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-job:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +100,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-job.enabled* | Whether to enable auto configuration of the kubernetes-job component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-job.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc
index 37203ca..b419929 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-namespaces-component]]
-= Kubernetes Namespaces Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
+== Kubernetes Namespaces Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Namespaces* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-namespaces:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-namespaces.enabled* | Whether to enable auto configuration of the kubernetes-namespaces component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-namespaces.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc
index 1abb15b..e427260 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-nodes-component]]
-= Kubernetes Nodes Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
+== Kubernetes Nodes Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Nodes* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-nodes:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-nodes.enabled* | Whether to enable auto configuration of the kubernetes-nodes component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-nodes.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc
index 3a3cbb8..fa815cd 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-persistent-volumes-claims-component]]
-= Kubernetes Persistent Volume Claim Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
+== Kubernetes Persistent Volume Claim Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Persistent Volume Claim* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-persistent-volumes-claims:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -92,4 +92,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-persistent-volumes-claims.enabled* | Whether to enable auto configuration of the kubernetes-persistent-volumes-claims component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-persistent-volumes-claims.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc
index a932904..9b8796b 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-persistent-volumes-component]]
-= Kubernetes Persistent Volume Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
+== Kubernetes Persistent Volume Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Persistent Volume* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-persistent-volumes:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -92,4 +92,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-persistent-volumes.enabled* | Whether to enable auto configuration of the kubernetes-persistent-volumes component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-persistent-volumes.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc
index 53656f7..eaa61f3 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-pods-component]]
-= Kubernetes Pods Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
+== Kubernetes Pods Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Pods* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-pods:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +100,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-pods.enabled* | Whether to enable auto configuration of the kubernetes-pods component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-pods.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-replication-controllers-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-replication-controllers-component.adoc
index c9d22a2..0509ed2 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-replication-controllers-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-replication-controllers-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-replication-controllers-component]]
-= Kubernetes Replication Controller Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
+== Kubernetes Replication Controller Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Replication Controller* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-replication-controllers:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-replication-controllers.enabled* | Whether to enable auto configuration of the kubernetes-replication-controllers component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-replication-controllers.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-resources-quota-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-resources-quota-component.adoc
index 59b4e39..185ec20 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-resources-quota-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-resources-quota-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-resources-quota-component]]
-= Kubernetes Resources Quota Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
+== Kubernetes Resources Quota Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Resources Quota* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-resources-quota:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -92,4 +92,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-resources-quota.enabled* | Whether to enable auto configuration of the kubernetes-resources-quota component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-resources-quota.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc
index 87a7a92..f94b206 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-secrets-component]]
-= Kubernetes Secrets Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
+== Kubernetes Secrets Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Secrets* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-secrets:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -92,4 +92,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-secrets.enabled* | Whether to enable auto configuration of the kubernetes-secrets component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-secrets.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-service-accounts-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-service-accounts-component.adoc
index 399957f..f672c2a 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-service-accounts-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-service-accounts-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-service-accounts-component]]
-= Kubernetes Service Account Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
+== Kubernetes Service Account Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Service Account* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -26,7 +26,7 @@ kubernetes-service-accounts:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -36,7 +36,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -90,4 +90,4 @@ The component supports 2 options, which are listed below.
 | *camel.component.kubernetes-service-accounts.enabled* | Whether to enable auto configuration of the kubernetes-service-accounts component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-service-accounts.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-services-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-services-component.adoc
index e09abcf..3a4bab5 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-services-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-services-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-services-component]]
-= Kubernetes Services Component
-:page-source: components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
+== Kubernetes Services Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Services* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-services:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
 | *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.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
-// spring-boot-auto-configure options: END
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/openshift-build-configs-component.adoc b/docs/components/modules/ROOT/pages/openshift-build-configs-component.adoc
index 82b41a4..385d2ff 100644
--- a/docs/components/modules/ROOT/pages/openshift-build-configs-component.adoc
+++ b/docs/components/modules/ROOT/pages/openshift-build-configs-component.adoc
@@ -1,8 +1,8 @@
-[[openshift-build-configs-component]]
-= Openshift Build Config Component
-:page-source: components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
+== Openshift Build Config Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *OpenShift Build Config* component is one of xref:kubernetes.adoc[Kubernetes Components] which
@@ -27,7 +27,7 @@ openshift-build-configs:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +37,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
diff --git a/docs/components/modules/ROOT/pages/openshift-builds-component.adoc b/docs/components/modules/ROOT/pages/openshift-builds-component.adoc
index cd77e1b..13782aa 100644
--- a/docs/components/modules/ROOT/pages/openshift-builds-component.adoc
+++ b/docs/components/modules/ROOT/pages/openshift-builds-component.adoc
@@ -1,8 +1,8 @@
-[[openshift-builds-component]]
-= Openshift Builds Component
-:page-source: components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
+== Openshift Builds Component
 
 *Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
 
 
 The *Kubernetes Builds* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -27,7 +27,7 @@ openshift-builds:masterUrl
 
 with the following path and query parameters:
 
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +37,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -64,4 +64,4 @@ with the following path and query parameters:
 | *trustCerts* (security) | Define if the certs we used are trusted anyway or not |  | Boolean
 | *username* (security) | Username to connect to Kubernetes |  | String
 |===
-// endpoint options: END
\ No newline at end of file
+// endpoint options: END
diff --git a/docs/components/modules/ROOT/pages/sql-component.adoc b/docs/components/modules/ROOT/pages/sql-component.adoc
index 40552ce..6ac77c7 100644
--- a/docs/components/modules/ROOT/pages/sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/sql-component.adoc
@@ -786,9 +786,9 @@ JDBC vendor.
 <bean id="repo"
 class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
   <property name="transactionManager" ref="transactionManager"/>
-  <propertyname="repositoryName" value="aggregation"/>
+  <property name="repositoryName" value="aggregation"/>
   <property name="dataSource" ref="dataSource"/>
-  <property name"jdbcOptimisticLockingExceptionMapper" ref="myExceptionMapper"/>
+  <property name="jdbcOptimisticLockingExceptionMapper" ref="myExceptionMapper"/>
 </bean>
 <!-- use the default mapper with extraFQN class names from our JDBC driver -->
 <bean id="myExceptionMapper" class="org.apache.camel.processor.aggregate.jdbc.DefaultJdbcOptimisticLockingExceptionMapper">
@@ -801,6 +801,50 @@ class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
 </bean>
 -----
 
+=== Propagation behavior
+
+`JdbcAggregationRepository` uses two distinct _transaction templates_ from Spring-TX. One is read-only
+and one is used for read-write operations.
+
+However, when using `JdbcAggregationRepository` within a route that itself uses `<transacted />` and there's
+common `PlatformTransactionManager` used, there may be a need to configure _propagation behavior_ used by
+transaction templates inside `JdbcAggregationRepository`.
+
+Here's a way to do it:
+[source,xml]
+----
+<bean id="repo"
+class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
+  <property name="propagationBehaviorName" value="PROPAGATION_NESTED" />
+</bean>
+----
+
+Propagation is specified by constants of `org.springframework.transaction.TransactionDefinition` interface,
+so `propagationBehaviorName` is convenient setter that allows to use names of the constants.
+
+=== PostgreSQL case
+
+There's special database that may cause problems with optimistic locking used by `JdbcAggregationRepository`.
+PostgreSQL marks connection as invalid in case of data integrity violation exception (the one with SQLState 23505).
+This makes the connection effectively unusable within nested transaction.
+Details can be found
+https://www.postgresql.org/message-id/200609241203.59292.ralf.wiebicke%40exedio.com[in this document].
+
+`org.apache.camel.processor.aggregate.jdbc.PostgresAggregationRepository` extends `JdbcAggregationRepository` and
+uses special `INSERT .. ON CONFLICT ..` statement to provide optimistic locking behavior.
+
+This statement is (with default aggregation table definition):
+[source,sql]
+----
+INSERT INTO aggregation (id, exchange) values (?, ?) ON CONFLICT DO NOTHING
+----
+
+Details can be found https://www.postgresql.org/docs/9.5/sql-insert.html[in PostgreSQL documentation].
+
+When this clause is used, `java.sql.PreparedStatement.executeUpdate()` call returns `0` instead of throwing
+SQLException with SQLState=23505. Further handling is exactly the same as with generic `JdbcAggregationRepository`,
+but without marking PostgreSQL connection as invalid.
+
 == Camel Sql Starter
 
 A starter module is available to spring-boot users. When using the starter,