You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/09/19 07:18:48 UTC
[camel] branch camel-2.x updated (d498b6b -> dc791f7)
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 d498b6b CAMEL-13986 - Camel-Kubernetes: Add deleteNode operation
new 29246bd CAMEL-13994 - listPods operation of kubernetes component dont support namespace option
new dc791f7 Camel-Kubernetes: Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../component/kubernetes/pods/KubernetesPodsProducer.java | 9 +++++++--
.../kubernetes/producer/KubernetesPodsProducerTest.java | 13 ++++++++++++-
2 files changed, 19 insertions(+), 3 deletions(-)
[camel] 01/02: CAMEL-13994 - listPods operation of kubernetes
component dont support namespace option
Posted by ac...@apache.org.
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 29246bd8a8ce87f8b6db461e256c885f9c395727
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 19 09:10:16 2019 +0200
CAMEL-13994 - listPods operation of kubernetes component dont support namespace option
---
.../component/kubernetes/pods/KubernetesPodsProducer.java | 9 +++++++--
.../kubernetes/producer/KubernetesPodsProducerTest.java | 13 ++++++++++++-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
index a2d5cd5..60db768 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
@@ -92,8 +92,13 @@ public class KubernetesPodsProducer extends DefaultProducer {
}
protected void doList(Exchange exchange, String operation) throws Exception {
- PodList podList = getEndpoint().getKubernetesClient().pods().inAnyNamespace().list();
-
+ PodList podList;
+ String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ if (ObjectHelper.isNotEmpty(namespaceName)) {
+ podList = getEndpoint().getKubernetesClient().pods().inNamespace(namespaceName).list();
+ } else {
+ podList = getEndpoint().getKubernetesClient().pods().inAnyNamespace().list();
+ }
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(podList.getItems());
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
index fc727ad..7b4f0ce 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
@@ -49,9 +49,20 @@ public class KubernetesPodsProducerTest extends KubernetesTestSupport {
@Test
public void listTest() throws Exception {
server.expect().withPath("/api/v1/pods").andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
+ server.expect().withPath("/api/v1/namespaces/test/pods").andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().build()).once();
List<Pod> result = template.requestBody("direct:list", "", List.class);
-
assertEquals(3, result.size());
+
+ Exchange ex = template.request("direct:list", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test");
+ }
+ });
+ List<Pod> resultNamespaced = ex.getOut().getBody(List.class);
+
+ assertEquals(2, resultNamespaced.size());
}
@Test
[camel] 02/02: Camel-Kubernetes: Fixed CS
Posted by ac...@apache.org.
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 dc791f7ddef59a5b98f75f85ac70f70f787d89e5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 19 09:14:21 2019 +0200
Camel-Kubernetes: Fixed CS
---
.../apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
index 60db768..242a8f4 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
@@ -97,7 +97,7 @@ public class KubernetesPodsProducer extends DefaultProducer {
if (ObjectHelper.isNotEmpty(namespaceName)) {
podList = getEndpoint().getKubernetesClient().pods().inNamespace(namespaceName).list();
} else {
- podList = getEndpoint().getKubernetesClient().pods().inAnyNamespace().list();
+ podList = getEndpoint().getKubernetesClient().pods().inAnyNamespace().list();
}
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(podList.getItems());