You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/06/14 11:50:27 UTC
[1/2] camel git commit: Upgrade Kubernetes/Openshift client to
version 1.3.97
Repository: camel
Updated Branches:
refs/heads/master d8f3f817c -> e3b63706d
Upgrade Kubernetes/Openshift client to version 1.3.97
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4e5e8a1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4e5e8a1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4e5e8a1
Branch: refs/heads/master
Commit: c4e5e8a1bb7fe139ec0412a411cc01312bfc368a
Parents: d8f3f81
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 14 13:43:01 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 14 13:43:01 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e5e8a1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a04c5a0..b0c5ac9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -360,7 +360,7 @@
<karaf4-version>4.0.5</karaf4-version>
<kie-version>6.4.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
- <kubernetes-client-version>1.3.95</kubernetes-client-version>
+ <kubernetes-client-version>1.3.97</kubernetes-client-version>
<kubernetes-model-version>1.0.50</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
@@ -440,7 +440,7 @@
<openejb-version>4.7.4</openejb-version>
<openjpa-version>2.4.1</openjpa-version>
<openshift-java-client-version>2.7.0.Final</openshift-java-client-version>
- <openshift-client-version>1.3.95</openshift-client-version>
+ <openshift-client-version>1.3.97</openshift-client-version>
<optaplanner-version>6.4.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>
[2/2] camel git commit: Upgrade Kubernetes-model to version 1.0.52
Posted by ac...@apache.org.
Upgrade Kubernetes-model to version 1.0.52
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3b63706
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3b63706
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3b63706
Branch: refs/heads/master
Commit: e3b63706d48e4ab8cf7fec3f46dfde08d790f017
Parents: c4e5e8a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 14 13:48:56 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 14 13:48:56 2016 +0200
----------------------------------------------------------------------
.../kubernetes/producer/KubernetesConfigMapsProducer.java | 3 +--
.../kubernetes/producer/KubernetesNamespacesProducer.java | 3 +--
.../producer/KubernetesPersistentVolumesClaimsProducer.java | 3 +--
.../component/kubernetes/producer/KubernetesPodsProducer.java | 3 +--
.../producer/KubernetesReplicationControllersProducer.java | 3 +--
.../kubernetes/producer/KubernetesResourcesQuotaProducer.java | 3 +--
.../kubernetes/producer/KubernetesServicesProducer.java | 3 +--
.../consumer/KubernetesReplicationControllersConsumerTest.java | 4 ++--
.../producer/KubernetesReplicationControllersProducerTest.java | 4 ++--
parent/pom.xml | 2 +-
10 files changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducer.java
index b0b389c..2909912 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducer.java
@@ -23,7 +23,6 @@ import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.api.model.ConfigMapList;
import io.fabric8.kubernetes.api.model.DoneableConfigMap;
-import io.fabric8.kubernetes.api.model.EditableConfigMap;
import io.fabric8.kubernetes.client.dsl.ClientNonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.ClientResource;
@@ -138,7 +137,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
}
Map<String, String> labels = exchange.getIn().getHeader(
KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, Map.class);
- EditableConfigMap cfMapCreating = new ConfigMapBuilder().withNewMetadata().withName(cfMapName)
+ ConfigMap cfMapCreating = new ConfigMapBuilder().withNewMetadata().withName(cfMapName)
.withLabels(labels).endMetadata().withData(configMapData).build();
configMap = getEndpoint().getKubernetesClient().configMaps()
.inNamespace(namespaceName).create(cfMapCreating);
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducer.java
index 5f13231..0be2584 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducer.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.kubernetes.producer;
import java.util.Map;
import io.fabric8.kubernetes.api.model.DoneableNamespace;
-import io.fabric8.kubernetes.api.model.EditableNamespace;
import io.fabric8.kubernetes.api.model.Namespace;
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
import io.fabric8.kubernetes.api.model.NamespaceList;
@@ -134,7 +133,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer {
}
Map<String, String> labels = exchange.getIn().getHeader(
KubernetesConstants.KUBERNETES_NAMESPACE_LABELS, Map.class);
- EditableNamespace ns = new NamespaceBuilder().withNewMetadata()
+ Namespace ns = new NamespaceBuilder().withNewMetadata()
.withName(namespaceName).withLabels(labels).endMetadata()
.build();
Namespace namespace = getEndpoint().getKubernetesClient().namespaces()
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducer.java
index 049d8d8..c05a02d 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducer.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.kubernetes.producer;
import java.util.Map;
import io.fabric8.kubernetes.api.model.DoneablePersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.EditablePersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaimList;
@@ -180,7 +179,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
.getHeader(
KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS,
Map.class);
- EditablePersistentVolumeClaim pvcCreating = new PersistentVolumeClaimBuilder()
+ PersistentVolumeClaim pvcCreating = new PersistentVolumeClaimBuilder()
.withNewMetadata().withName(pvcName).withLabels(labels)
.endMetadata().withSpec(pvcSpec).build();
pvc = getEndpoint().getKubernetesClient().persistentVolumeClaims()
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java
index 7619357..1c61e72 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.kubernetes.producer;
import java.util.Map;
import io.fabric8.kubernetes.api.model.DoneablePod;
-import io.fabric8.kubernetes.api.model.EditablePod;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.api.model.PodList;
@@ -160,7 +159,7 @@ public class KubernetesPodsProducer extends DefaultProducer {
}
Map<String, String> labels = exchange.getIn().getHeader(
KubernetesConstants.KUBERNETES_PODS_LABELS, Map.class);
- EditablePod podCreating = new PodBuilder().withNewMetadata()
+ Pod podCreating = new PodBuilder().withNewMetadata()
.withName(podName).withLabels(labels).endMetadata()
.withSpec(podSpec).build();
pod = getEndpoint().getKubernetesClient().pods()
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/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 b5edb5f..153b0d2 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
@@ -19,7 +19,6 @@ package org.apache.camel.component.kubernetes.producer;
import java.util.Map;
import io.fabric8.kubernetes.api.model.DoneableReplicationController;
-import io.fabric8.kubernetes.api.model.EditableReplicationController;
import io.fabric8.kubernetes.api.model.ReplicationController;
import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder;
import io.fabric8.kubernetes.api.model.ReplicationControllerList;
@@ -190,7 +189,7 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(
KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLERS_LABELS,
Map.class);
- EditableReplicationController rcCreating = new ReplicationControllerBuilder()
+ ReplicationController rcCreating = new ReplicationControllerBuilder()
.withNewMetadata().withName(rcName).withLabels(labels)
.endMetadata().withSpec(rcSpec).build();
rc = getEndpoint().getKubernetesClient().replicationControllers()
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducer.java
index 0c4a89c..a9afe3f 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducer.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.kubernetes.producer;
import java.util.Map;
import io.fabric8.kubernetes.api.model.DoneableResourceQuota;
-import io.fabric8.kubernetes.api.model.EditableResourceQuota;
import io.fabric8.kubernetes.api.model.ResourceQuota;
import io.fabric8.kubernetes.api.model.ResourceQuotaBuilder;
import io.fabric8.kubernetes.api.model.ResourceQuotaList;
@@ -176,7 +175,7 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(
KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_LABELS,
Map.class);
- EditableResourceQuota rqCreating = new ResourceQuotaBuilder()
+ ResourceQuota rqCreating = new ResourceQuotaBuilder()
.withNewMetadata().withName(rqName).withLabels(labels)
.endMetadata().withSpec(rqSpec).build();
rq = getEndpoint().getKubernetesClient().resourceQuotas()
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducer.java
index ac78c30..85b543f 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducer.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.kubernetes.producer;
import java.util.Map;
import io.fabric8.kubernetes.api.model.DoneableService;
-import io.fabric8.kubernetes.api.model.EditableService;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceList;
@@ -179,7 +178,7 @@ public class KubernetesServicesProducer extends DefaultProducer {
}
Map<String, String> labels = exchange.getIn().getHeader(
KubernetesConstants.KUBERNETES_SERVICE_LABELS, Map.class);
- EditableService serviceCreating = new ServiceBuilder()
+ Service serviceCreating = new ServiceBuilder()
.withNewMetadata().withName(serviceName).withLabels(labels)
.endMetadata().withSpec(serviceSpec).build();
service = getEndpoint().getKubernetesClient().services()
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java
index 814a20a..e8835ec 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.EditablePodTemplateSpec;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.PodTemplateSpecBuilder;
import io.fabric8.kubernetes.api.model.ReplicationController;
import io.fabric8.kubernetes.api.model.ReplicationControllerSpec;
@@ -61,7 +61,7 @@ public class KubernetesReplicationControllersConsumerTest extends KubernetesTest
ReplicationControllerSpec rcSpec = new ReplicationControllerSpec();
rcSpec.setReplicas(2);
PodTemplateSpecBuilder builder = new PodTemplateSpecBuilder();
- EditablePodTemplateSpec t = builder.withNewMetadata().withName("nginx-template")
+ PodTemplateSpec t = builder.withNewMetadata().withName("nginx-template")
.addToLabels("server", "nginx").endMetadata().withNewSpec().addNewContainer()
.withName("wildfly").withImage("jboss/wildfly").addNewPort().withContainerPort(80).endPort()
.endContainer().endSpec().build();
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
index f28d913..08ca143 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.EditablePodTemplateSpec;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.PodTemplateSpecBuilder;
import io.fabric8.kubernetes.api.model.ReplicationController;
import io.fabric8.kubernetes.api.model.ReplicationControllerSpec;
@@ -145,7 +145,7 @@ public class KubernetesReplicationControllersProducerTest extends
ReplicationControllerSpec rcSpec = new ReplicationControllerSpec();
rcSpec.setReplicas(2);
PodTemplateSpecBuilder builder = new PodTemplateSpecBuilder();
- EditablePodTemplateSpec t = builder.withNewMetadata()
+ PodTemplateSpec t = builder.withNewMetadata()
.withName("nginx-template")
.addToLabels("server", "nginx").endMetadata()
.withNewSpec().addNewContainer()
http://git-wip-us.apache.org/repos/asf/camel/blob/e3b63706/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b0c5ac9..beacea4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -361,7 +361,7 @@
<kie-version>6.4.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
<kubernetes-client-version>1.3.97</kubernetes-client-version>
- <kubernetes-model-version>1.0.50</kubernetes-model-version>
+ <kubernetes-model-version>1.0.52</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
<libphonenumber-version>7.4.0</libphonenumber-version>