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/16 14:54:13 UTC
[camel] branch camel-2.x updated (65a3370 -> 7cb8856)
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 65a3370 Cleanup duplicate "Available from..." and fix h...
new fcd4fe1 Camel-Kubernetes: Use the same namespace in the configmap consumer test
new 4a9702a CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, fixed the resourceName usage
new 7cb8856 CAMEL-13978 - Fixed CS
The 3 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:
.../config_maps/KubernetesConfigMapsConsumer.java | 12 +++++-----
.../consumer/KubernetesConfigMapsConsumerTest.java | 27 +++++++++++++++++++---
2 files changed, 30 insertions(+), 9 deletions(-)
[camel] 03/03: CAMEL-13978 - 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 7cb8856444a1c7c050323d3789d18bf5b0ca32bf
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 16 16:45:18 2019 +0200
CAMEL-13978 - Fixed CS
---
.../kubernetes/config_maps/KubernetesConfigMapsConsumer.java | 9 ++++-----
.../camel/component/kubernetes/KubernetesTestSupport.java | 2 +-
.../kubernetes/consumer/KubernetesConfigMapsConsumerTest.java | 10 ++++------
3 files changed, 9 insertions(+), 12 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 1b7128d..956cfdc 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
@@ -20,13 +20,10 @@ import java.util.concurrent.ExecutorService;
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.FilterWatchListDeletable;
-import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
-import io.fabric8.kubernetes.client.dsl.Resource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -91,10 +88,12 @@ public class KubernetesConfigMapsConsumer extends DefaultConsumer {
FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch, Watcher<ConfigMap>> w = null;
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
&& ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue())) {
- w = getEndpoint().getKubernetesClient().configMaps().withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(), getEndpoint().getKubernetesConfiguration().getLabelValue());
+ w = getEndpoint().getKubernetesClient().configMaps().withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(),
+ getEndpoint().getKubernetesConfiguration().getLabelValue());
}
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getResourceName())) {
- w = (FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch, Watcher<ConfigMap>>) getEndpoint().getKubernetesClient().configMaps().withName(getEndpoint().getKubernetesConfiguration().getResourceName());
+ w = (FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch, Watcher<ConfigMap>>)getEndpoint().getKubernetesClient().configMaps()
+ .withName(getEndpoint().getKubernetesConfiguration().getResourceName());
}
watch = w.watch(new Watcher<ConfigMap>() {
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
index 8cf45f9..0f17738 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
@@ -31,7 +31,7 @@ public class KubernetesTestSupport extends CamelTestSupport {
@Override
public void setUp() throws Exception {
// INSERT credentials and host here
- authToken = "IVStwJAV_7p26ifo1NX1R3cjNDLkGFUaU0R6VW6dbwo";
+ authToken = "";
host = "https://192.168.99.100:8443";
super.setUp();
}
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 a9e01c5..9ed6575 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
@@ -61,12 +61,12 @@ public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_DATA, configMapData);
}
});
-
+
ex = template.request("direct:createConfigmap", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- exchange.getIn().removeHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS);
+ exchange.getIn().removeHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, "test1");
HashMap<String, String> configMapData = new HashMap<>();
@@ -83,7 +83,7 @@ public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, "test");
}
});
-
+
ex = template.request("direct:deleteConfigmap", new Processor() {
@Override
@@ -93,7 +93,6 @@ public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
}
});
-
boolean cmDeleted = ex.getOut().getBody(Boolean.class);
assertTrue(cmDeleted);
@@ -110,8 +109,7 @@ public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
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=default&resourceName=test", host, authToken).process(new KubernertesProcessor())
- .to(mockResultEndpoint);
+ fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=default&resourceName=test", host, authToken).process(new KubernertesProcessor()).to(mockResultEndpoint);
}
};
}
[camel] 02/03: CAMEL-13978 - Create ConfigMap Watch feature in
Kubernetes Component, fixed the resourceName usage
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 4a9702a89fb394421ec8e967217d64ac7e3b04c3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 16 16:42:05 2019 +0200
CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, fixed the resourceName usage
---
.../config_maps/KubernetesConfigMapsConsumer.java | 7 +++---
.../kubernetes/KubernetesTestSupport.java | 2 +-
.../consumer/KubernetesConfigMapsConsumerTest.java | 27 ++++++++++++++++++++--
3 files changed, 30 insertions(+), 6 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 c93a708..1b7128d 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
@@ -24,6 +24,7 @@ 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.FilterWatchListDeletable;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
@@ -87,13 +88,13 @@ public class KubernetesConfigMapsConsumer extends DefaultConsumer {
@Override
public void run() {
- NonNamespaceOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> w = getEndpoint().getKubernetesClient().configMaps();
+ FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch, Watcher<ConfigMap>> w = null;
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
&& ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue())) {
- w.withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(), getEndpoint().getKubernetesConfiguration().getLabelValue());
+ w = getEndpoint().getKubernetesClient().configMaps().withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(), getEndpoint().getKubernetesConfiguration().getLabelValue());
}
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getResourceName())) {
- w.withName(getEndpoint().getKubernetesConfiguration().getResourceName());
+ w = (FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch, Watcher<ConfigMap>>) getEndpoint().getKubernetesClient().configMaps().withName(getEndpoint().getKubernetesConfiguration().getResourceName());
}
watch = w.watch(new Watcher<ConfigMap>() {
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
index 0f17738..8cf45f9 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
@@ -31,7 +31,7 @@ public class KubernetesTestSupport extends CamelTestSupport {
@Override
public void setUp() throws Exception {
// INSERT credentials and host here
- authToken = "";
+ authToken = "IVStwJAV_7p26ifo1NX1R3cjNDLkGFUaU0R6VW6dbwo";
host = "https://192.168.99.100:8443";
super.setUp();
}
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 5b62438..a9e01c5 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
@@ -61,6 +61,19 @@ public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_DATA, configMapData);
}
});
+
+ ex = template.request("direct:createConfigmap", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().removeHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS);
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default");
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, "test1");
+ 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() {
@@ -70,6 +83,16 @@ public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, "test");
}
});
+
+ 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, "test1");
+ }
+ });
+
boolean cmDeleted = ex.getOut().getBody(Boolean.class);
@@ -87,7 +110,7 @@ public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
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=default&labelKey=this&labelValue=rocks", host, authToken).process(new KubernertesProcessor())
+ fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=default&resourceName=test", host, authToken).process(new KubernertesProcessor())
.to(mockResultEndpoint);
}
};
@@ -98,7 +121,7 @@ public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
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));
+ System.err.println("Got event with configmap name: " + cm.getMetadata().getName() + " and action " + in.getHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION));
}
}
}
[camel] 01/03: Camel-Kubernetes: Use the same namespace in the
configmap consumer test
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 fcd4fe130e42d39dea2f5b20f31f8b75302dd450
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 16 15:47:20 2019 +0200
Camel-Kubernetes: Use the same namespace in the configmap consumer test
---
.../component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 60ce676..5b62438 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
@@ -87,7 +87,7 @@ public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
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())
+ fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=default&labelKey=this&labelValue=rocks", host, authToken).process(new KubernertesProcessor())
.to(mockResultEndpoint);
}
};