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 2016/09/06 05:45:40 UTC
[1/2] karaf-cellar git commit: [KARAF-4699] Check Kubernetes POD
label value while discovering nodes
Repository: karaf-cellar
Updated Branches:
refs/heads/master be64a7cf3 -> 355b714e1
[KARAF-4699] Check Kubernetes POD label value while discovering nodes
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/17f60564
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/17f60564
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/17f60564
Branch: refs/heads/master
Commit: 17f605643f9813a5ae13f9ea8ed1d6a3195ac266
Parents: be64a7c
Author: Victor Antonovich <v....@gmail.com>
Authored: Mon Sep 5 15:18:58 2016 +0300
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Tue Sep 6 07:39:25 2016 +0200
----------------------------------------------------------------------
.../apache/karaf/cellar/kubernetes/KubernetesDiscoveryService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/17f60564/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 2873da2..e4f0890 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
@@ -74,7 +74,7 @@ public class KubernetesDiscoveryService implements DiscoveryService {
PodList podList = kubernetesClient.pods().list();
for (Pod pod : podList.getItems()) {
String value = pod.getMetadata().getLabels().get(kubernetesPodLabelKey);
- if (value != null && !value.isEmpty()) {
+ if (value != null && !value.isEmpty() && value.equals(kubernetesPodLabelValue)) {
members.add(pod.getStatus().getPodIP());
}
}
[2/2] karaf-cellar git commit: [KARAF-4699] This closes #33
Posted by jb...@apache.org.
[KARAF-4699] This closes #33
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/355b714e
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/355b714e
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/355b714e
Branch: refs/heads/master
Commit: 355b714e1a933bbdf78f678d6e0b0ff5dde887f6
Parents: be64a7c 17f6056
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Tue Sep 6 07:45:33 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Tue Sep 6 07:45:33 2016 +0200
----------------------------------------------------------------------
.../apache/karaf/cellar/kubernetes/KubernetesDiscoveryService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------