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 2018/07/10 06:22:19 UTC
[camel] branch master updated (2d40b1e -> f303d87)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 2d40b1e Upgrade Chronicle Network to version 1.16.2
new e450683 Upgrade Kubernetes model to version 3.0.0
new 55431d6 Upgrade Kubernetes client to version 4.0.0
new f303d87 Fixed Camel-Kubernetes after upgrading to client 4.0.0
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../consumer/common/DeploymentEvent.java | 2 +-
.../deployments/KubernetesDeploymentsConsumer.java | 8 ++++----
.../deployments/KubernetesDeploymentsProducer.java | 22 +++++++++++-----------
.../KubernetesDeploymentsProducerTest.java | 6 +++---
parent/pom.xml | 4 ++--
5 files changed, 21 insertions(+), 21 deletions(-)
[camel] 03/03: Fixed Camel-Kubernetes after upgrading to client
4.0.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f303d87349d062438c8e26f9d00e853261cb3fd1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 10 08:19:55 2018 +0200
Fixed Camel-Kubernetes after upgrading to client 4.0.0
---
.../consumer/common/DeploymentEvent.java | 2 +-
.../deployments/KubernetesDeploymentsConsumer.java | 8 ++++----
.../deployments/KubernetesDeploymentsProducer.java | 22 +++++++++++-----------
.../KubernetesDeploymentsProducerTest.java | 6 +++---
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/DeploymentEvent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/DeploymentEvent.java
index 56e85d1..74bdba5 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/DeploymentEvent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/DeploymentEvent.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.kubernetes.consumer.common;
-import io.fabric8.kubernetes.api.model.extensions.Deployment;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.client.Watcher.Action;
public class DeploymentEvent {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java
index 21ac329..2ba82d5 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.kubernetes.deployments;
import java.util.concurrent.ExecutorService;
-import io.fabric8.kubernetes.api.model.extensions.Deployment;
-import io.fabric8.kubernetes.api.model.extensions.DeploymentList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.fabric8.kubernetes.api.model.apps.DeploymentList;
+import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
@@ -91,7 +91,7 @@ public class KubernetesDeploymentsConsumer extends DefaultConsumer {
@Override
public void run() {
- NonNamespaceOperation<Deployment, DeploymentList, DoneableDeployment, ScalableResource<Deployment, DoneableDeployment>> w = getEndpoint().getKubernetesClient().extensions().deployments();
+ NonNamespaceOperation<Deployment, DeploymentList, DoneableDeployment, ScalableResource<Deployment, DoneableDeployment>> w = getEndpoint().getKubernetesClient().apps().deployments();
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
&& ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue())) {
w.withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(), getEndpoint().getKubernetesConfiguration().getLabelValue());
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
index c9dc275..84bb513 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
@@ -18,11 +18,11 @@ package org.apache.camel.component.kubernetes.deployments;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.extensions.Deployment;
-import io.fabric8.kubernetes.api.model.extensions.DeploymentBuilder;
-import io.fabric8.kubernetes.api.model.extensions.DeploymentList;
-import io.fabric8.kubernetes.api.model.extensions.DeploymentSpec;
-import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
+import io.fabric8.kubernetes.api.model.apps.DeploymentList;
+import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
+import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.ScalableResource;
@@ -91,7 +91,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
}
protected void doList(Exchange exchange, String operation) throws Exception {
- DeploymentList deploymentsList = getEndpoint().getKubernetesClient().extensions().deployments().list();
+ DeploymentList deploymentsList = getEndpoint().getKubernetesClient().apps().deployments().list();
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(deploymentsList.getItems());
@@ -101,7 +101,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
DeploymentList deploymentList = null;
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS, Map.class);
NonNamespaceOperation<Deployment, DeploymentList, DoneableDeployment, ScalableResource<Deployment, DoneableDeployment>> deployments = getEndpoint().getKubernetesClient()
- .extensions().deployments();
+ .apps().deployments();
for (Map.Entry<String, String> entry : labels.entrySet()) {
deployments.withLabel(entry.getKey(), entry.getValue());
}
@@ -118,7 +118,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
LOG.error("Get a specific Deployment require specify a Deployment name");
throw new IllegalArgumentException("Get a specific Deployment require specify a Deployment name");
}
- deployment = getEndpoint().getKubernetesClient().extensions().deployments().withName(deploymentName).get();
+ deployment = getEndpoint().getKubernetesClient().apps().deployments().withName(deploymentName).get();
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(deployment);
@@ -136,7 +136,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
throw new IllegalArgumentException("Delete a specific deployment require specify a namespace name");
}
- Boolean deployment = getEndpoint().getKubernetesClient().extensions().deployments().inNamespace(namespaceName).withName(deploymentName).delete();
+ Boolean deployment = getEndpoint().getKubernetesClient().apps().deployments().inNamespace(namespaceName).withName(deploymentName).delete();
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(deployment);
@@ -161,7 +161,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
}
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS, Map.class);
Deployment deploymentCreating = new DeploymentBuilder().withNewMetadata().withName(deploymentName).withLabels(labels).endMetadata().withSpec(deSpec).build();
- deployment = getEndpoint().getKubernetesClient().extensions().deployments().inNamespace(namespaceName).create(deploymentCreating);
+ deployment = getEndpoint().getKubernetesClient().apps().deployments().inNamespace(namespaceName).create(deploymentCreating);
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(deployment);
@@ -183,7 +183,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
LOG.error("Scale a specific deployment require specify a replicas number");
throw new IllegalArgumentException("Scale a specific deployment require specify a replicas number");
}
- Deployment deploymentScaled = getEndpoint().getKubernetesClient().extensions().deployments().inNamespace(namespaceName).withName(deploymentName).scale(replicasNumber, false);
+ Deployment deploymentScaled = getEndpoint().getKubernetesClient().apps().deployments().inNamespace(namespaceName).withName(deploymentName).scale(replicasNumber, false);
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(deploymentScaled.getStatus().getReplicas());
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
index d2ddd10..8f72dd0 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
@@ -20,9 +20,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.extensions.Deployment;
-import io.fabric8.kubernetes.api.model.extensions.DeploymentBuilder;
-import io.fabric8.kubernetes.api.model.extensions.DeploymentListBuilder;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
+import io.fabric8.kubernetes.api.model.apps.DeploymentListBuilder;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
import org.apache.camel.Exchange;
[camel] 02/03: Upgrade Kubernetes client to version 4.0.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 55431d6756d9d2b8b256aa7554284a6168eeb162
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 10 08:07:27 2018 +0200
Upgrade Kubernetes client to version 4.0.0
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 41549be..d36e462 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -446,7 +446,7 @@
<karaf4-version>4.2.0</karaf4-version>
<kie-version>7.3.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
- <kubernetes-client-version>3.2.0</kubernetes-client-version>
+ <kubernetes-client-version>4.0.0</kubernetes-client-version>
<kubernetes-model-version>3.0.0</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
[camel] 01/03: Upgrade Kubernetes model to version 3.0.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e4506837c1209904272cc4d834ceb2233be659d8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 10 08:07:12 2018 +0200
Upgrade Kubernetes model to version 3.0.0
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ea79ab7..41549be 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -447,7 +447,7 @@
<kie-version>7.3.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
<kubernetes-client-version>3.2.0</kubernetes-client-version>
- <kubernetes-model-version>2.1.1</kubernetes-model-version>
+ <kubernetes-model-version>3.0.0</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.10</leveldb-api-version>