Repository: karaf-cellar Updated Branches: refs/heads/master 0de236afa -> 9152a5e0a
Update Fabric8 Kubernetes API. Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/9c5ef47a Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/9c5ef47a Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/9c5ef47a Branch: refs/heads/master Commit: 9c5ef47ae668c97d9c2cf882c28103b54acf34a9 Parents: 3044652 Author: Victor Antonovich <[email protected]> Authored: Fri Aug 7 12:38:42 2015 +0400 Committer: Victor Antonovich <[email protected]> Committed: Fri Aug 7 11:48:16 2015 +0300 ---------------------------------------------------------------------- kubernetes/pom.xml | 2 +- .../cellar/kubernetes/KubernetesDiscoveryService.java | 14 ++++++++------ pom.xml | 7 ++++--- 3 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9c5ef47a/kubernetes/pom.xml ---------------------------------------------------------------------- diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml index e6dcec7..eab3fae 100644 --- a/kubernetes/pom.xml +++ b/kubernetes/pom.xml @@ -44,7 +44,7 @@ <!-- Fabric8 Kubernetes API Dependencies --> <dependency> <groupId>io.fabric8</groupId> - <artifactId>kubernetes-api</artifactId> + <artifactId>kubernetes-client</artifactId> </dependency> <!-- OSGi --> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9c5ef47a/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 a42e2bf..cfae315 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,10 +13,11 @@ */ package org.apache.karaf.cellar.kubernetes; -import io.fabric8.kubernetes.api.KubernetesClient; -import io.fabric8.kubernetes.api.KubernetesFactory; +import io.fabric8.kubernetes.client.DefaultKubernetesClient; +import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodList; + import org.apache.karaf.cellar.core.discovery.DiscoveryService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +48,8 @@ public class KubernetesDiscoveryService implements DiscoveryService { try { String kubernetesUrl = "http://"; + kubernetesHost + ":" + kubernetesPort; LOGGER.debug("CELLAR KUBERNETES: query API at {} ...", kubernetesUrl); - kubernetesClient = new KubernetesClient(new KubernetesFactory(kubernetesUrl)); + DefaultKubernetesClient.Config config = new DefaultKubernetesClient.ConfigBuilder().masterUrl(kubernetesUrl).build(); + kubernetesClient = new DefaultKubernetesClient(config); LOGGER.debug("CELLAR KUBERNETES: discovery service initialized"); } catch (Exception e) { LOGGER.error("CELLAR KUBERNETES: can't init discovery service", e); @@ -67,11 +69,11 @@ public class KubernetesDiscoveryService implements DiscoveryService { LOGGER.debug("CELLAR KUBERNETES: query pods with labeled with [{}={}]", kubernetesPodLabelKey, kubernetesPodLabelValue); Set<String> members = new HashSet<String>(); try { - PodList podList = kubernetesClient.getPods(); + PodList podList = kubernetesClient.pods().list(); for (Pod pod : podList.getItems()) { - String value = pod.getLabels().get(kubernetesPodLabelKey); + String value = pod.getMetadata().getLabels().get(kubernetesPodLabelKey); if (value != null && !value.isEmpty()) { - members.add(pod.getCurrentState().getPodIP()); + members.add(pod.getStatus().getPodIP()); } } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9c5ef47a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4ef2057..9f5a7a7 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,8 @@ <properties> <easymock.version>3.2</easymock.version> - <fabric8.version>2.0.20</fabric8.version> + <fabric8.version>2.2.19</fabric8.version> + <fabric8.kubernetes-client.version>1.2.2</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> @@ -292,8 +293,8 @@ <!-- Kubernetes --> <dependency> <groupId>io.fabric8</groupId> - <artifactId>kubernetes-api</artifactId> - <version>${fabric8.version}</version> + <artifactId>kubernetes-client</artifactId> + <version>${fabric8.kubernetes-client.version}</version> </dependency> <!-- Testing -->
