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/02/17 18:39:32 UTC
[camel] branch master updated (21c61e6 -> 4060fca)
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 21c61e6 Regen docs
new 8f7e24f Upgrade Kubernetes client and model to version 4.8.0
new 4060fca Fixed Camel-Kubernetes Karaf feature
The 2 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:
.../kubernetes/producer/KubernetesHPAProducerTest.java | 10 +++++-----
parent/pom.xml | 4 ++--
platforms/karaf/features/src/main/resources/features.xml | 1 +
3 files changed, 8 insertions(+), 7 deletions(-)
[camel] 01/02: Upgrade Kubernetes client and model to version 4.8.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 8f7e24f9f0a0f7cb4ebb30ae056a10fd06e86397
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 17 19:34:13 2020 +0100
Upgrade Kubernetes client and model to version 4.8.0
---
.../kubernetes/producer/KubernetesHPAProducerTest.java | 10 +++++-----
parent/pom.xml | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
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 9c6203f..23950c5 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
@@ -47,7 +47,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
@Test
public void listTest() throws Exception {
- server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers")
+ server.expect().withPath("/apis/autoscaling/v2beta2/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/v2beta1/namespaces/test/horizontalpodautoscalers?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
+ server.expect().withPath("/apis/autoscaling/v2beta2/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/v2beta1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
- server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/ns1/horizontalpodautoscalers/hpa2").andReturn(200, hpa2).once();
+ 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();
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/v2beta1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
+ server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
Exchange ex = template.request("direct:deleteHPA", new Processor() {
diff --git a/parent/pom.xml b/parent/pom.xml
index c46b20b..babe690 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -407,8 +407,8 @@
<kafka-bundle-version>2.4.0_1</kafka-bundle-version>
<karaf4-version>4.2.8</karaf4-version>
<kie-version>7.32.0.Final</kie-version>
- <kubernetes-client-version>4.7.1</kubernetes-client-version>
- <kubernetes-model-version>4.7.1</kubernetes-model-version>
+ <kubernetes-client-version>4.8.0</kubernetes-client-version>
+ <kubernetes-model-version>4.8.0</kubernetes-model-version>
<kudu-version>1.10.0</kudu-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
[camel] 02/02: Fixed Camel-Kubernetes Karaf feature
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 4060fca2b9785eb83f348cd5b9e93ca6d3a1a8a7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 17 19:39:04 2020 +0100
Fixed Camel-Kubernetes Karaf feature
---
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index f061a82..c68bfb2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1611,6 +1611,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.generex/${generex-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.automaton/${automaton-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>