camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [3/3] camel git commit: Upgrade Kubernetes Client to version 2.3.1
Date Wed, 10 May 2017 07:42:14 GMT
Upgrade Kubernetes Client to version 2.3.1


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

Branch: refs/heads/master
Commit: db6242e5eadec2efb9290de030433641fcb03b10
Parents: 7c88f38
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Wed May 10 09:32:53 2017 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Wed May 10 09:40:36 2017 +0200

----------------------------------------------------------------------
 .../consumer/KubernetesReplicationControllersConsumer.java   | 6 +++---
 .../producer/KubernetesReplicationControllersProducer.java   | 8 +++-----
 parent/pom.xml                                               | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/db6242e5/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java
index 9cb71da..cacc8a4 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java
@@ -25,7 +25,7 @@ import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.Watch;
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.fabric8.kubernetes.client.dsl.RollableScallableResource;
+import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -91,8 +91,8 @@ public class KubernetesReplicationControllersConsumer extends DefaultConsumer
{
         
         @Override
         public void run() {
-            MixedOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController,

-                RollableScallableResource<ReplicationController, DoneableReplicationController>>
w = getEndpoint().getKubernetesClient().replicationControllers();
+            MixedOperation<ReplicationController, ReplicationControllerList, 
+                DoneableReplicationController, RollableScalableResource<ReplicationController,
DoneableReplicationController>> w = getEndpoint().getKubernetesClient().replicationControllers();
             if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespace()))
{
                 w.inNamespace(getEndpoint().getKubernetesConfiguration().getNamespace());
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/db6242e5/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducer.java
index c9933d8..8275d9c 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducer.java
@@ -25,7 +25,7 @@ import io.fabric8.kubernetes.api.model.ReplicationControllerList;
 import io.fabric8.kubernetes.api.model.ReplicationControllerSpec;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
-import io.fabric8.kubernetes.client.dsl.RollableScallableResource;
+import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.kubernetes.KubernetesConstants;
@@ -122,8 +122,7 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer
{
         if (!ObjectHelper.isEmpty(namespaceName)) {
 
             NonNamespaceOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController,

-            RollableScallableResource<ReplicationController, DoneableReplicationController>>
replicationControllers; 
-            replicationControllers = getEndpoint().getKubernetesClient()
+            RollableScalableResource<ReplicationController, DoneableReplicationController>>
replicationControllers = getEndpoint().getKubernetesClient()
                     .replicationControllers().inNamespace(namespaceName);
             for (Map.Entry<String, String> entry : labels.entrySet()) {
                 replicationControllers.withLabel(entry.getKey(),
@@ -132,8 +131,7 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer
{
             rcList = replicationControllers.list();
         } else {
             MixedOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController,

-            RollableScallableResource<ReplicationController, DoneableReplicationController>>
replicationControllers;
-            replicationControllers = getEndpoint().getKubernetesClient()
+            RollableScalableResource<ReplicationController, DoneableReplicationController>>
replicationControllers = getEndpoint().getKubernetesClient()
                     .replicationControllers();
             for (Map.Entry<String, String> entry : labels.entrySet()) {
                 replicationControllers.withLabel(entry.getKey(),

http://git-wip-us.apache.org/repos/asf/camel/blob/db6242e5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index eb2879a..38c9fa8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -407,7 +407,7 @@
     <karaf4-version>4.1.1</karaf4-version>
     <kie-version>6.5.0.Final</kie-version>
     <krati-version>0.4.9</krati-version>
-    <kubernetes-client-version>2.2.14</kubernetes-client-version>
+    <kubernetes-client-version>2.3.1</kubernetes-client-version>
     <kubernetes-model-version>1.0.73</kubernetes-model-version>
     <kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
     <leveldbjni-version>1.8</leveldbjni-version>


Mime
View raw message