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 2017/05/30 09:04:52 UTC

[03/12] camel git commit: CAMEL-11356: Camel-Kubernetes: refactoring tests by using Kubernetes-server-mock and Openshift-server-mock - Configmaps Tests

CAMEL-11356: Camel-Kubernetes: refactoring tests by using Kubernetes-server-mock and Openshift-server-mock - Configmaps Tests


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2cf8921f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2cf8921f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2cf8921f

Branch: refs/heads/master
Commit: 2cf8921f81199d3c9570a2f828d5371486ad2814
Parents: 53e0fd5
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon May 29 15:21:59 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue May 30 11:01:10 2017 +0200

----------------------------------------------------------------------
 .../KubernetesConfigMapsProducer.java           |  66 ++++-----
 .../kubernetes/KubernetesTestSupport.java       |   4 +
 ...recatedKubernetesConfigMapsProducerTest.java |   2 +
 .../KubernetesBuildConfigsProducerTest.java     |   4 -
 .../producer/KubernetesBuildsProducerTest.java  |   4 -
 .../KubernetesConfigMapsProducerTest.java       | 144 ++++++-------------
 .../producer/KubernetesPodsProducerTest.java    |   4 -
 7 files changed, 74 insertions(+), 154 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2cf8921f/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
index 560d32d..6e8b368 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
@@ -23,13 +23,15 @@ import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ConfigMapList;
 import io.fabric8.kubernetes.api.model.DoneableConfigMap;
+import io.fabric8.kubernetes.client.Watch;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConstants;
-import org.apache.camel.component.kubernetes.KubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesOperations;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.util.MessageHelper;
@@ -47,7 +49,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
 
     @Override
     public AbstractKubernetesEndpoint getEndpoint() {
-        return (AbstractKubernetesEndpoint) super.getEndpoint();
+        return (AbstractKubernetesEndpoint)super.getEndpoint();
     }
 
     @Override
@@ -73,11 +75,11 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
         case KubernetesOperations.GET_CONFIGMAP_OPERATION:
             doGetConfigMap(exchange, operation);
             break;
-            
+
         case KubernetesOperations.CREATE_CONFIGMAP_OPERATION:
             doCreateConfigMap(exchange, operation);
             break;
-            
+
         case KubernetesOperations.DELETE_CONFIGMAP_OPERATION:
             doDeleteConfigMap(exchange, operation);
             break;
@@ -88,19 +90,19 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
     }
 
     protected void doList(Exchange exchange, String operation) throws Exception {
-        ConfigMapList configMapsList = getEndpoint().getKubernetesClient().configMaps().list();
+        ConfigMapList configMapsList = getEndpoint().getKubernetesClient().configMaps().inAnyNamespace().list();
         exchange.getOut().setBody(configMapsList.getItems());
     }
 
     protected void doListConfigMapsByLabels(Exchange exchange, String operation) throws Exception {
         ConfigMapList configMapsList = null;
         Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, Map.class);
-        NonNamespaceOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> configMaps = getEndpoint().getKubernetesClient().configMaps();
+        FilterWatchListMultiDeletable<ConfigMap, ConfigMapList, Boolean, Watch, Watcher<ConfigMap>> configMaps = getEndpoint().getKubernetesClient().configMaps().inAnyNamespace();
         for (Map.Entry<String, String> entry : labels.entrySet()) {
             configMaps.withLabel(entry.getKey(), entry.getValue());
         }
         configMapsList = configMaps.list();
-        
+
         MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
         exchange.getOut().setBody(configMapsList.getItems());
     }
@@ -117,59 +119,45 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
         MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
         exchange.getOut().setBody(configMap);
     }
-    
+
     protected void doCreateConfigMap(Exchange exchange, String operation) throws Exception {
         ConfigMap configMap = null;
-        String cfMapName = exchange.getIn().getHeader(
-                KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, String.class);
-        String namespaceName = exchange.getIn().getHeader(
-                KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
-        HashMap<String, String> configMapData = exchange.getIn().getHeader(
-                KubernetesConstants.KUBERNETES_CONFIGMAP_DATA, HashMap.class);
+        String cfMapName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, String.class);
+        String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+        HashMap<String, String> configMapData = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_DATA, HashMap.class);
         if (ObjectHelper.isEmpty(cfMapName)) {
             LOG.error("Create a specific configMap require specify a configMap name");
-            throw new IllegalArgumentException(
-                    "Create a specific configMap require specify a configMap name");
+            throw new IllegalArgumentException("Create a specific configMap require specify a configMap name");
         }
         if (ObjectHelper.isEmpty(namespaceName)) {
             LOG.error("Create a specific configMap require specify a namespace name");
-            throw new IllegalArgumentException(
-                    "Create a specific configMap require specify a namespace name");
+            throw new IllegalArgumentException("Create a specific configMap require specify a namespace name");
         }
         if (ObjectHelper.isEmpty(configMapData)) {
             LOG.error("Create a specific configMap require specify a data map");
-            throw new IllegalArgumentException(
-                    "Create a specific configMap require specify a data map");
+            throw new IllegalArgumentException("Create a specific configMap require specify a data map");
         }
-        Map<String, String> labels = exchange.getIn().getHeader(
-                KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, Map.class);
-        ConfigMap cfMapCreating = new ConfigMapBuilder().withNewMetadata().withName(cfMapName)
-                .withLabels(labels).endMetadata().withData(configMapData).build();
-        configMap = getEndpoint().getKubernetesClient().configMaps()
-                .inNamespace(namespaceName).create(cfMapCreating);
-        
+        Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, Map.class);
+        ConfigMap cfMapCreating = new ConfigMapBuilder().withNewMetadata().withName(cfMapName).withLabels(labels).endMetadata().withData(configMapData).build();
+        configMap = getEndpoint().getKubernetesClient().configMaps().inNamespace(namespaceName).create(cfMapCreating);
+
         MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
         exchange.getOut().setBody(configMap);
     }
-    
+
     protected void doDeleteConfigMap(Exchange exchange, String operation) throws Exception {
-        String configMapName = exchange.getIn().getHeader(
-                KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, String.class);
-        String namespaceName = exchange.getIn().getHeader(
-                KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+        String configMapName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, String.class);
+        String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
         if (ObjectHelper.isEmpty(configMapName)) {
             LOG.error("Delete a specific config map require specify a config map name");
-            throw new IllegalArgumentException(
-                    "Delete a specific config map require specify a config map name");
+            throw new IllegalArgumentException("Delete a specific config map require specify a config map name");
         }
         if (ObjectHelper.isEmpty(namespaceName)) {
             LOG.error("Delete a specific config map require specify a namespace name");
-            throw new IllegalArgumentException(
-                    "Delete a specific config map require specify a namespace name");
+            throw new IllegalArgumentException("Delete a specific config map require specify a namespace name");
         }
-        boolean cfMapDeleted = getEndpoint().getKubernetesClient().configMaps()
-                .inNamespace(namespaceName).withName(configMapName).delete();
-        
+        boolean cfMapDeleted = getEndpoint().getKubernetesClient().configMaps().inNamespace(namespaceName).withName(configMapName).delete();
+
         MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
         exchange.getOut().setBody(cfMapDeleted);
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/2cf8921f/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
----------------------------------------------------------------------
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 81ffdc9..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
@@ -35,4 +35,8 @@ public class KubernetesTestSupport extends CamelTestSupport {
         host = "https://192.168.99.100:8443";
         super.setUp();
     }
+    
+    public static String toUrlEncoded(String str) {
+        return str.replaceAll("=", "%3D");
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/2cf8921f/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesConfigMapsProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesConfigMapsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesConfigMapsProducerTest.java
index 2313dc7..6eff680 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesConfigMapsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesConfigMapsProducerTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.kubernetes.deprecated;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.kubernetes.producer.KubernetesConfigMapsProducerTest;
+import org.junit.Ignore;
 
+@Ignore
 @Deprecated
 public class DeprecatedKubernetesConfigMapsProducerTest extends KubernetesConfigMapsProducerTest {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2cf8921f/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducerTest.java
index e607a70..67e3817 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducerTest.java
@@ -83,8 +83,4 @@ public class KubernetesBuildConfigsProducerTest extends KubernetesTestSupport {
             }
         };
     }
-
-    private static String toUrlEncoded(String str) {
-        return str.replaceAll("=", "%3D");
-    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/2cf8921f/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducerTest.java
index c8595dd..2505d84 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducerTest.java
@@ -83,8 +83,4 @@ public class KubernetesBuildsProducerTest extends KubernetesTestSupport {
             }
         };
     }
-
-    private static String toUrlEncoded(String str) {
-        return str.replaceAll("=", "%3D");
-    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/2cf8921f/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
index 09ec4dc..3cfc109 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
@@ -17,146 +17,94 @@
 package org.apache.camel.component.kubernetes.producer;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
+import io.fabric8.kubernetes.api.model.ConfigMapListBuilder;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
 
 import org.apache.camel.Exchange;
 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.util.ObjectHelper;
+import org.apache.camel.impl.JndiRegistry;
+import org.junit.Rule;
 import org.junit.Test;
 
 public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
 
+    @Rule
+    public KubernetesServer server = new KubernetesServer();
+
+    @Override
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry registry = super.createRegistry();
+        registry.bind("kubernetesClient", server.getClient());
+        return registry;
+    }
+
     @Test
     public void listTest() throws Exception {
-        if (ObjectHelper.isEmpty(authToken)) {
-            return;
-        }
+        server.expect().withPath("/api/v1/configmaps").andReturn(200, new ConfigMapListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
         List<ConfigMap> result = template.requestBody("direct:list", "", List.class);
-        assertEquals(1, result.size());
+        assertEquals(3, result.size());
     }
 
     @Test
     public void listByLabelsTest() throws Exception {
-        if (ObjectHelper.isEmpty(authToken)) {
-            return;
-        }
+        server.expect().withPath("/api/v1/configmaps?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
+            .andReturn(200, new ConfigMapListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
         Exchange ex = template.request("direct:listConfigMapsByLabels", new Processor() {
 
             @Override
             public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(
-                        KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
-                        "default");
                 Map<String, String> labels = new HashMap<String, String>();
-                labels.put("component", "elasticsearch");
-                exchange.getIn().setHeader(
-                        KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, labels);
+                labels.put("key1", "value1");
+                labels.put("key2", "value2");
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, labels);
             }
         });
 
         List<ConfigMap> result = ex.getOut().getBody(List.class);
 
-        boolean configMapExists = false;
-        Iterator<ConfigMap> it = result.iterator();
-        while (it.hasNext()) {
-            ConfigMap cfMap = it.next();
-            if (cfMap.getMetadata().getLabels().containsValue("elasticsearch")) {
-                configMapExists = true;
-            }
-        }
-
-        assertFalse(configMapExists);
+        assertEquals(3, result.size());
     }
 
     @Test
     public void getConfigMapTest() throws Exception {
-        if (ObjectHelper.isEmpty(authToken)) {
-            return;
-        }
+        ObjectMeta meta = new ObjectMeta();
+        meta.setName("cm1");
+        server.expect().withPath("/api/v1/namespaces/test/configmaps/cm1").andReturn(200, new ConfigMapBuilder().withMetadata(meta).build()).once();
+        server.expect().withPath("/api/v1/namespaces/test/configmaps/cm2").andReturn(200, new ConfigMapBuilder().build()).once();
         Exchange ex = template.request("direct:getConfigMap", 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,
-                        "elasticsearch-7015o");
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test");
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, "cm1");
             }
         });
 
         ConfigMap result = ex.getOut().getBody(ConfigMap.class);
 
-        assertNull(result);
+        assertEquals("cm1", result.getMetadata().getName());
     }
 
     @Test
     public void createGetAndDeleteConfigMap() throws Exception {
-        if (ObjectHelper.isEmpty(authToken)) {
-            return;
-        }
-        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<String, String>();
-                labels.put("this", "rocks");
-                exchange.getIn().setHeader(
-                        KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, labels);
-
-                Map<String, String> data = new HashMap<String, String>();
-                
-                data.put("test", "test1");
-                data.put("test1", "test2");
-
-                exchange.getIn().setHeader(
-                        KubernetesConstants.KUBERNETES_CONFIGMAP_DATA, data);
-            }
-        });
-        
-        ex = template.request("direct:getConfigMap", 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");
-            }
-        });
-
-        ConfigMap result = ex.getOut().getBody(ConfigMap.class);
-        
-        assertNotNull(result);
-        assertTrue(result.getData().containsKey("test"));
-        assertTrue(result.getData().containsKey("test1"));
-        assertEquals("test1", result.getData().get("test"));
-        assertEquals("test2", result.getData().get("test1"));
+        ConfigMap cm1 = new ConfigMapBuilder().withNewMetadata().withName("cm1").withNamespace("test").and().build();
+        server.expect().withPath("/api/v1/namespaces/test/configmaps/cm1").andReturn(200, cm1).once();
 
-        ex = template.request("direct:deleteConfigMap", new Processor() {
+        Exchange 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");
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test");
+                exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, "cm1");
             }
         });
 
@@ -170,21 +118,11 @@ public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("direct:list")
-                        .toF("kubernetes-config-maps://%s?oauthToken=%s&operation=listConfigMaps",
-                                host, authToken);
-                from("direct:listConfigMapsByLabels")
-                        .toF("kubernetes-config-maps://%s?oauthToken=%s&operation=listConfigMapsByLabels",
-                                host, authToken);
-                from("direct:getConfigMap")
-                        .toF("kubernetes-config-maps://%s?oauthToken=%s&operation=getConfigMap",
-                                host, authToken);
-                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);
+                from("direct:list").to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=listConfigMaps");
+                from("direct:listConfigMapsByLabels").to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=listConfigMapsByLabels");
+                from("direct:getConfigMap").to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=getConfigMap");
+                from("direct:createConfigMap").to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=createConfigMap");
+                from("direct:deleteConfigMap").to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=deleteConfigMap");
             }
         };
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/2cf8921f/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
----------------------------------------------------------------------
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 463aaf5..cae096f 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
@@ -126,8 +126,4 @@ public class KubernetesPodsProducerTest extends KubernetesTestSupport {
             }
         };
     }
-
-    private static String toUrlEncoded(String str) {
-        return str.replaceAll("=", "%3D");
-    }
 }