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:00 UTC
[1/4] karaf-cellar git commit: Update Fabric8 Kubernetes API.
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 <v....@gmail.com>
Authored: Fri Aug 7 12:38:42 2015 +0400
Committer: Victor Antonovich <v....@gmail.com>
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 -->
[2/4] karaf-cellar git commit: Update Fabric8 version to 2.2.22
Posted by jb...@apache.org.
Update Fabric8 version to 2.2.22
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/2df5df13
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/2df5df13
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/2df5df13
Branch: refs/heads/master
Commit: 2df5df13ea72c422c15bd8cb451cb9d3470ef809
Parents: 9c5ef47
Author: Victor Antonovich <v....@gmail.com>
Authored: Wed Aug 19 11:01:22 2015 +0300
Committer: Victor Antonovich <v....@gmail.com>
Committed: Wed Aug 19 11:01:22 2015 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/2df5df13/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9f5a7a7..ab66005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<properties>
<easymock.version>3.2</easymock.version>
- <fabric8.version>2.2.19</fabric8.version>
+ <fabric8.version>2.2.22</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>
[4/4] karaf-cellar git commit: Merge master
Posted by jb...@apache.org.
Merge master
# Conflicts:
# kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryService.java
# pom.xml
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/9152a5e0
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/9152a5e0
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/9152a5e0
Branch: refs/heads/master
Commit: 9152a5e0aaeb08afba136793e16074e4e9d334c5
Parents: 77847a1 0de236a
Author: Victor Antonovich <v....@gmail.com>
Authored: Wed Sep 9 19:42:44 2015 +0400
Committer: Victor Antonovich <v....@gmail.com>
Committed: Wed Sep 9 19:42:44 2015 +0400
----------------------------------------------------------------------
NOTICE | 2 +-
assembly/pom.xml | 86 ++--
assembly/src/main/resources/features.xml | 87 ++--
bundle/NOTICE | 2 +-
bundle/pom.xml | 41 +-
.../karaf/cellar/bundle/BundleSynchronizer.java | 2 +
.../cellar/bundle/LocalBundleListener.java | 10 +-
.../cellar/bundle/internal/osgi/Activator.java | 144 +++++++
.../karaf/cellar/bundle/shell/BlockCommand.java | 6 +-
.../bundle/shell/BundleCommandSupport.java | 10 +-
.../bundle/shell/InstallBundleCommand.java | 13 +-
.../cellar/bundle/shell/ListBundleCommand.java | 8 +-
.../cellar/bundle/shell/StartBundleCommand.java | 6 +-
.../cellar/bundle/shell/StopBundleCommand.java | 7 +-
.../bundle/shell/UninstallBundleCommand.java | 6 +-
.../completers/AllBundlesNameCompleter.java | 14 +-
.../completers/AllBundlesVersionCompleter.java | 14 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 67 ----
.../resources/OSGI-INF/blueprint/management.xml | 36 --
.../OSGI-INF/blueprint/shell-bundle.xml | 104 -----
cloud/NOTICE | 2 +-
cloud/pom.xml | 23 +-
.../apache/karaf/cellar/cloud/Activator.java | 46 ---
.../cellar/cloud/internal/osgi/Activator.java | 47 +++
config/NOTICE | 2 +-
config/pom.xml | 34 +-
.../config/ConfigurationSynchronizer.java | 2 +
.../cellar/config/internal/osgi/Activator.java | 143 +++++++
.../karaf/cellar/config/shell/BlockCommand.java | 13 +-
.../cellar/config/shell/DeleteCommand.java | 13 +-
.../karaf/cellar/config/shell/ListCommand.java | 11 +-
.../cellar/config/shell/PropAppendCommand.java | 13 +-
.../cellar/config/shell/PropDelCommand.java | 13 +-
.../config/shell/PropExcludedCommand.java | 9 +-
.../cellar/config/shell/PropListCommand.java | 11 +-
.../cellar/config/shell/PropSetCommand.java | 13 +-
.../completers/ClusterConfigCompleter.java | 16 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 81 ----
.../resources/OSGI-INF/blueprint/management.xml | 31 --
.../OSGI-INF/blueprint/shell-config.xml | 115 ------
core/NOTICE | 2 +-
core/pom.xml | 22 +-
.../karaf/cellar/core/command/TimeoutTask.java | 4 +-
.../cellar/core/internal/osgi/Activator.java | 76 ++++
.../cellar/core/shell/CellarCommandSupport.java | 17 +-
.../shell/completer/AllGroupsCompleter.java | 2 +
.../core/shell/completer/AllNodeCompleter.java | 2 +
.../shell/completer/GroupCompleterSupport.java | 12 +-
.../shell/completer/LocalGroupsCompleter.java | 2 +
.../shell/completer/NodeCompleterSupport.java | 12 +-
.../shell/completer/OtherGroupsCompleter.java | 2 +
.../resources/OSGI-INF/blueprint/blueprint.xml | 27 --
dosgi/NOTICE | 2 +-
dosgi/pom.xml | 31 +-
.../cellar/dosgi/internal/osgi/Activator.java | 125 ++++++
.../shell/ListDistributedServicesCommand.java | 6 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 58 ---
.../resources/OSGI-INF/blueprint/management.xml | 32 --
.../OSGI-INF/blueprint/shell-dosgi.xml | 25 --
event/NOTICE | 2 +-
event/pom.xml | 25 +-
.../cellar/event/internal/osgi/Activator.java | 107 +++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 60 ---
features/NOTICE | 2 +-
features/pom.xml | 37 +-
.../cellar/features/FeaturesSynchronizer.java | 4 +-
.../features/internal/osgi/Activator.java | 160 ++++++++
.../cellar/features/shell/BlockCommand.java | 11 +-
.../features/shell/InstallFeatureCommand.java | 15 +-
.../features/shell/ListFeaturesCommand.java | 17 +-
.../cellar/features/shell/RepoAddCommand.java | 15 +-
.../cellar/features/shell/RepoListCommand.java | 15 +-
.../features/shell/RepoRemoveCommand.java | 15 +-
.../features/shell/UninstallFeatureCommand.java | 13 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 75 ----
.../resources/OSGI-INF/blueprint/management.xml | 36 --
.../OSGI-INF/blueprint/shell-features.xml | 110 ------
hazelcast/NOTICE | 2 +-
hazelcast/pom.xml | 27 +-
.../factory/HazelcastConfigurationManager.java | 5 +
.../hazelcast/internal/osgi/Activator.java | 395 +++++++++++++++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 197 ---------
.../resources/OSGI-INF/blueprint/management.xml | 59 ---
itests/pom.xml | 20 +-
.../karaf/cellar/itests/CellarTestSupport.java | 167 ++++----
kubernetes/NOTICE | 2 +-
kubernetes/pom.xml | 22 +-
.../karaf/cellar/kubernetes/Activator.java | 46 ---
.../kubernetes/internal/osgi/Activator.java | 45 +++
manual/NOTICE | 2 +-
obr/NOTICE | 2 +-
obr/pom.xml | 33 +-
.../karaf/cellar/obr/ObrUrlSynchronizer.java | 2 +
.../cellar/obr/internal/osgi/Activator.java | 140 +++++++
.../cellar/obr/shell/ObrAddUrlCommand.java | 11 +-
.../cellar/obr/shell/ObrCommandSupport.java | 3 +-
.../cellar/obr/shell/ObrDeployCommand.java | 13 +-
.../karaf/cellar/obr/shell/ObrListCommand.java | 13 +-
.../cellar/obr/shell/ObrListUrlCommand.java | 9 +-
.../cellar/obr/shell/ObrRemoveUrlCommand.java | 11 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 65 ---
.../resources/OSGI-INF/blueprint/management.xml | 30 --
.../OSGI-INF/blueprint/shell-commands.xml | 82 ----
pom.xml | 73 ++--
samples/camel-hazelcast-app/NOTICE | 2 +-
samples/dosgi-greeter/NOTICE | 2 +-
samples/dosgi-greeter/client/pom.xml | 17 +-
.../dosgi/greeter/client/GreetCommand.java | 11 +-
.../OSGI-INF/blueprint/shell-greeter.xml | 29 --
samples/dosgi-greeter/service/pom.xml | 24 +-
.../dosgi/greeter/service/Activator.java | 48 +++
.../resources/OSGI-INF/blueprint/blueprint.xml | 39 --
samples/hazelcast-app/NOTICE | 2 +-
samples/hazelcast-app/pom.xml | 4 +-
shell/NOTICE | 2 +-
shell/pom.xml | 30 +-
.../cellar/shell/ClusterCommandSupport.java | 2 +
.../karaf/cellar/shell/NodePingCommand.java | 9 +-
.../karaf/cellar/shell/NodesListCommand.java | 7 +-
.../apache/karaf/cellar/shell/SyncCommand.java | 14 +-
.../shell/consumer/ConsumerStartCommand.java | 9 +-
.../shell/consumer/ConsumerStatusCommand.java | 9 +-
.../shell/consumer/ConsumerStopCommand.java | 9 +-
.../cellar/shell/consumer/ConsumerSupport.java | 2 +-
.../cellar/shell/group/GroupCreateCommand.java | 6 +-
.../cellar/shell/group/GroupDeleteCommand.java | 9 +-
.../cellar/shell/group/GroupJoinCommand.java | 11 +-
.../cellar/shell/group/GroupListCommand.java | 9 +-
.../cellar/shell/group/GroupPickCommand.java | 11 +-
.../cellar/shell/group/GroupQuitCommand.java | 11 +-
.../cellar/shell/group/GroupSetCommand.java | 11 +-
.../karaf/cellar/shell/group/GroupSupport.java | 2 +-
.../shell/handler/HandlersStartCommand.java | 9 +-
.../shell/handler/HandlersStatusCommand.java | 9 +-
.../shell/handler/HandlersStopCommand.java | 9 +-
.../cellar/shell/handler/HandlersSupport.java | 2 +-
.../shell/producer/ProducerStartCommand.java | 9 +-
.../shell/producer/ProducerStatusCommand.java | 9 +-
.../shell/producer/ProducerStopCommand.java | 9 +-
.../cellar/shell/producer/ProducerSupport.java | 2 +-
.../OSGI-INF/blueprint/shell-cluster.xml | 208 ----------
utils/NOTICE | 2 +-
utils/pom.xml | 23 +-
.../utils/ping/internal/osgi/Activator.java | 63 +++
.../resources/OSGI-INF/blueprint/blueprint.xml | 35 --
webconsole/NOTICE | 2 +-
webconsole/pom.xml | 24 +-
.../webconsole/internal/osgi/Activator.java | 74 ++++
.../OSGI-INF/blueprint/webconsole-cellar.xml | 37 --
149 files changed, 2575 insertions(+), 2249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9152a5e0/kubernetes/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9152a5e0/pom.xml
----------------------------------------------------------------------
[3/4] karaf-cellar git commit: Update Fabric8 version to 2.2.23
Posted by jb...@apache.org.
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>