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 2020/05/05 10:42:06 UTC
[camel] 02/03: Camel-Kubernetes: Aligned to the new autoscaling DSL
group
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 c75af7c95c15654dafd7c760055e48cd0e25d734
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue May 5 11:40:44 2020 +0200
Camel-Kubernetes: Aligned to the new autoscaling DSL group
---
.../component/kubernetes/consumer/common/HPAEvent.java | 3 ++-
.../kubernetes/hpa/KubernetesHPAConsumer.java | 10 +++++-----
.../kubernetes/hpa/KubernetesHPAProducer.java | 18 +++++++++---------
.../kubernetes/producer/KubernetesHPAProducerTest.java | 16 ++++++++--------
4 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/HPAEvent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/HPAEvent.java
index e9f13a2..3e2ac3e 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/HPAEvent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/HPAEvent.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.kubernetes.consumer.common;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscaler;
+
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler;
import io.fabric8.kubernetes.client.Watcher.Action;
public class HPAEvent {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAConsumer.java
index 3780a72..d1f546b 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAConsumer.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.kubernetes.hpa;
import java.util.concurrent.ExecutorService;
-import io.fabric8.kubernetes.api.model.DoneableHorizontalPodAutoscaler;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscaler;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerList;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.DoneableHorizontalPodAutoscaler;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
@@ -90,8 +90,8 @@ public class KubernetesHPAConsumer extends DefaultConsumer {
@Override
public void run() {
- MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> w = getEndpoint()
- .getKubernetesClient().autoscaling().horizontalPodAutoscalers();
+ MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> w = getEndpoint()
+ .getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers();
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespace())) {
w.inNamespace(getEndpoint().getKubernetesConfiguration().getNamespace());
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
index a8d50de..1ec2f81 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.kubernetes.hpa;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscaler;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerBuilder;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerList;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerSpec;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerBuilder;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerSpec;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
@@ -86,7 +86,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
}
protected void doList(Exchange exchange, String operation) throws Exception {
- HorizontalPodAutoscalerList hpaList = getEndpoint().getKubernetesClient().autoscaling().horizontalPodAutoscalers().list();
+ HorizontalPodAutoscalerList hpaList = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().list();
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(hpaList.getItems());
@@ -100,7 +100,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
}
FilterWatchListMultiDeletable<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Boolean, Watch, Watcher<HorizontalPodAutoscaler>> hpas = getEndpoint()
- .getKubernetesClient().autoscaling().horizontalPodAutoscalers();
+ .getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers();
for (Map.Entry<String, String> entry : labels.entrySet()) {
hpas.withLabel(entry.getKey(), entry.getValue());
}
@@ -122,7 +122,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
LOG.error("Get a specific hpa require specify a namespace name");
throw new IllegalArgumentException("Get a specific hpa require specify a namespace name");
}
- hpa = getEndpoint().getKubernetesClient().autoscaling().horizontalPodAutoscalers().inNamespace(namespaceName).withName(podName).get();
+ hpa = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().inNamespace(namespaceName).withName(podName).get();
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(hpa);
@@ -147,7 +147,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
}
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_HPA_LABELS, Map.class);
HorizontalPodAutoscaler hpaCreating = new HorizontalPodAutoscalerBuilder().withNewMetadata().withName(hpaName).withLabels(labels).endMetadata().withSpec(hpaSpec).build();
- hpa = getEndpoint().getKubernetesClient().autoscaling().horizontalPodAutoscalers().inNamespace(namespaceName).create(hpaCreating);
+ hpa = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().inNamespace(namespaceName).create(hpaCreating);
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(hpa);
@@ -164,7 +164,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
LOG.error("Delete a specific hpa require specify a namespace name");
throw new IllegalArgumentException("Delete a specific hpa require specify a namespace name");
}
- boolean hpaDeleted = getEndpoint().getKubernetesClient().autoscaling().horizontalPodAutoscalers().inNamespace(namespaceName).withName(hpaName).delete();
+ boolean hpaDeleted = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().inNamespace(namespaceName).withName(hpaName).delete();
MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
exchange.getOut().setBody(hpaDeleted);
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
index 29eb375..fc704cd 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
@@ -20,10 +20,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscaler;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerBuilder;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerListBuilder;
import io.fabric8.kubernetes.api.model.PodListBuilder;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerBuilder;
+import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerListBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
import org.apache.camel.BindToRegistry;
@@ -47,7 +47,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
@Test
public void listTest() throws Exception {
- server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers")
+ server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers")
.andReturn(200, new HorizontalPodAutoscalerListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
List<HorizontalPodAutoscaler> result = template.requestBody("direct:list", "", List.class);
@@ -56,7 +56,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
@Test
public void listByLabelsTest() throws Exception {
- server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
+ server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
Exchange ex = template.request("direct:listByLabels", new Processor() {
@@ -79,8 +79,8 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
HorizontalPodAutoscaler hpa1 = new HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa1").withNamespace("test").and().build();
HorizontalPodAutoscaler hpa2 = new HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa2").withNamespace("ns1").and().build();
- server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
- server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/ns1/horizontalpodautoscalers/hpa2").andReturn(200, hpa2).once();
+ server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
+ server.expect().withPath("/apis/autoscaling/v1/namespaces/ns1/horizontalpodautoscalers/hpa2").andReturn(200, hpa2).once();
Exchange ex = template.request("direct:getHPA", new Processor() {
@Override
@@ -98,7 +98,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
@Test
public void deleteHPATest() throws Exception {
HorizontalPodAutoscaler hpa1 = new HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa1").withNamespace("test").and().build();
- server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
+ server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
Exchange ex = template.request("direct:deleteHPA", new Processor() {