Repository: camel Updated Branches: refs/heads/master d6df9d06a -> 77e342501
Upgrade Kubernetes/Openshift client to version 1.3.83 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/77e34250 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/77e34250 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/77e34250 Branch: refs/heads/master Commit: 77e3425018d2c9106a9ff71f9c758bbf6760e0e1 Parents: d6df9d0 Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue Apr 12 14:36:05 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Apr 12 14:36:05 2016 +0200 ---------------------------------------------------------------------- .../KubernetesPersistentVolumesProducer.java | 35 ++++---------------- parent/pom.xml | 4 +-- 2 files changed, 9 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/77e34250/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java index 051b5b1..6037206 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java @@ -21,7 +21,6 @@ import java.util.Map; import io.fabric8.kubernetes.api.model.DoneablePersistentVolume; import io.fabric8.kubernetes.api.model.PersistentVolume; import io.fabric8.kubernetes.api.model.PersistentVolumeList; -import io.fabric8.kubernetes.client.dsl.ClientMixedOperation; import io.fabric8.kubernetes.client.dsl.ClientNonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.ClientResource; @@ -82,7 +81,7 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer { protected void doList(Exchange exchange, String operation) throws Exception { PersistentVolumeList persistentVolumeList = getEndpoint() - .getKubernetesClient().persistentVolumes().inAnyNamespace().list(); + .getKubernetesClient().persistentVolumes().list(); exchange.getOut().setBody(persistentVolumeList.getItems()); } @@ -92,24 +91,12 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer { Map<String, String> labels = exchange.getIn().getHeader( KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_LABELS, Map.class); - String namespaceName = exchange.getIn().getHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); - if (!ObjectHelper.isEmpty(namespaceName)) { - ClientNonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, ClientResource<PersistentVolume, DoneablePersistentVolume>> pvs; - pvs = getEndpoint().getKubernetesClient().persistentVolumes() - .inNamespace(namespaceName); - for (Map.Entry<String, String> entry : labels.entrySet()) { - pvs.withLabel(entry.getKey(), entry.getValue()); - } - pvList = pvs.list(); - } else { - ClientMixedOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, ClientResource<PersistentVolume, DoneablePersistentVolume>> pvs; - pvs = getEndpoint().getKubernetesClient().persistentVolumes(); - for (Map.Entry<String, String> entry : labels.entrySet()) { - pvs.withLabel(entry.getKey(), entry.getValue()); - } - pvList = pvs.list(); + ClientNonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, ClientResource<PersistentVolume, DoneablePersistentVolume>> pvs; + pvs = getEndpoint().getKubernetesClient().persistentVolumes(); + for (Map.Entry<String, String> entry : labels.entrySet()) { + pvs.withLabel(entry.getKey(), entry.getValue()); } + pvList = pvs.list(); exchange.getOut().setBody(pvList.getItems()); } @@ -119,20 +106,12 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer { String pvName = exchange.getIn().getHeader( KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_NAME, String.class); - String namespaceName = exchange.getIn().getHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(pvName)) { LOG.error("Get a specific Persistent Volume require specify a Persistent Volume name"); throw new IllegalArgumentException( "Get a specific Persistent Volume require specify a Persistent Volume name"); } - if (ObjectHelper.isEmpty(namespaceName)) { - LOG.error("Get a specific Persistent Volume require specify a namespace name"); - throw new IllegalArgumentException( - "Get a specific Persistent Volume require specify a namespace name"); - } - pv = getEndpoint().getKubernetesClient().persistentVolumes() - .inNamespace(namespaceName).withName(pvName).get(); + pv = getEndpoint().getKubernetesClient().persistentVolumes().withName(pvName).get(); exchange.getOut().setBody(pv); } } http://git-wip-us.apache.org/repos/asf/camel/blob/77e34250/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 38d26c8..fae0569 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -357,7 +357,7 @@ <karaf4-version>4.0.4</karaf4-version> <kie-version>6.3.0.Final</kie-version> <krati-version>0.4.9</krati-version> - <kubernetes-client-version>1.3.82</kubernetes-client-version> + <kubernetes-client-version>1.3.83</kubernetes-client-version> <kubernetes-model-version>1.0.45</kubernetes-model-version> <kxml2-bundle-version>2.3.0_3</kxml2-bundle-version> <leveldbjni-version>1.8</leveldbjni-version> @@ -436,7 +436,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.82</openshift-client-version> + <openshift-client-version>1.3.83</openshift-client-version> <optaplanner-version>6.3.0.Final</optaplanner-version> <oro-bundle-version>2.0.8_6</oro-bundle-version> <oscache-bundle-version>2.4_5</oscache-bundle-version>
