You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/09/09 22:19:02 UTC
[3/4] karaf-cellar git commit: Update Fabric8 version to 2.2.23
Update Fabric8 version to 2.2.23
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/77847a1b
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/77847a1b
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/77847a1b
Branch: refs/heads/master
Commit: 77847a1beae7e096362228572d95dddd49a322cc
Parents: 2df5df1
Author: Victor Antonovich <v....@gmail.com>
Authored: Wed Sep 2 20:34:49 2015 +0400
Committer: Victor Antonovich <v....@gmail.com>
Committed: Wed Sep 9 17:26:42 2015 +0300
----------------------------------------------------------------------
.../karaf/cellar/kubernetes/KubernetesDiscoveryService.java | 4 +++-
pom.xml | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/77847a1b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryService.java
----------------------------------------------------------------------
diff --git a/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryService.java b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryService.java
index cfae315..2873da2 100644
--- a/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryService.java
+++ b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryService.java
@@ -13,6 +13,8 @@
*/
package org.apache.karaf.cellar.kubernetes;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.ConfigBuilder;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.api.model.Pod;
@@ -48,7 +50,7 @@ public class KubernetesDiscoveryService implements DiscoveryService {
try {
String kubernetesUrl = "http://" + kubernetesHost + ":" + kubernetesPort;
LOGGER.debug("CELLAR KUBERNETES: query API at {} ...", kubernetesUrl);
- DefaultKubernetesClient.Config config = new DefaultKubernetesClient.ConfigBuilder().masterUrl(kubernetesUrl).build();
+ Config config = new ConfigBuilder().withMasterUrl(kubernetesUrl).build();
kubernetesClient = new DefaultKubernetesClient(config);
LOGGER.debug("CELLAR KUBERNETES: discovery service initialized");
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/77847a1b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ab66005..8842ac6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,8 @@
<properties>
<easymock.version>3.2</easymock.version>
- <fabric8.version>2.2.22</fabric8.version>
- <fabric8.kubernetes-client.version>1.2.2</fabric8.kubernetes-client.version>
+ <fabric8.version>2.2.23</fabric8.version>
+ <fabric8.kubernetes-client.version>1.3.22</fabric8.kubernetes-client.version>
<felix.bundlerepository.version>2.0.4</felix.bundlerepository.version>
<felix.utils.version>1.8.0</felix.utils.version>
<felix.webconsole.version>4.2.8</felix.webconsole.version>