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/12/17 10:50:32 UTC

[camel] branch master updated (5de001b -> 5e69c23)

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 5de001b  Fixed CS
     new e6740d6  Upgrade Kubernetes Client to version 4.1.1
     new af84847  Upgrade Kubernetes Model to version 4.1.1
     new 5e69c23  Camel-Kubernetes: Fixed tests after upgrading to version 4.1.1

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:
 .../kubernetes/producer/KubernetesHPAProducerTest.java         | 10 +++++-----
 parent/pom.xml                                                 |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)


[camel] 02/03: Upgrade Kubernetes Model to version 4.1.1

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 af84847841feeedcd61c225273ace21d3edfb1c4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 17 11:18:00 2018 +0100

    Upgrade Kubernetes Model to version 4.1.1
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 5f5e246..b75f10a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -450,7 +450,7 @@
     <kie-version>7.14.0.Final</kie-version>
     <krati-version>0.4.9</krati-version>
     <kubernetes-client-version>4.1.1</kubernetes-client-version>
-    <kubernetes-model-version>4.1.0</kubernetes-model-version>
+    <kubernetes-model-version>4.1.1</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>


[camel] 01/03: Upgrade Kubernetes Client to version 4.1.1

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 e6740d6c0c6077cf98d4c9772f68cf37a58e2551
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 17 11:17:43 2018 +0100

    Upgrade Kubernetes Client to version 4.1.1
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 1e506e8..5f5e246 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -449,7 +449,7 @@
     <karaf4-version>4.2.1</karaf4-version>
     <kie-version>7.14.0.Final</kie-version>
     <krati-version>0.4.9</krati-version>
-    <kubernetes-client-version>4.1.0</kubernetes-client-version>
+    <kubernetes-client-version>4.1.1</kubernetes-client-version>
     <kubernetes-model-version>4.1.0</kubernetes-model-version>
     <kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
     <leveldbjni-version>1.8</leveldbjni-version>


[camel] 03/03: Camel-Kubernetes: Fixed tests after upgrading to version 4.1.1

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 5e69c239fb0c87352938502a64d5a102fc2d08e4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 17 11:49:57 2018 +0100

    Camel-Kubernetes: Fixed tests after upgrading to version 4.1.1
---
 .../kubernetes/producer/KubernetesHPAProducerTest.java         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 2c30b6d..181562f 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
@@ -49,7 +49,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
 
     @Test
     public void listTest() throws Exception {
-        server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers")
+        server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers")
             .andReturn(200, new HorizontalPodAutoscalerListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
         List<HorizontalPodAutoscaler> result = template.requestBody("direct:list", "", List.class);
 
@@ -58,7 +58,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
 
     @Test
     public void listByLabelsTest() throws Exception {
-        server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
+        server.expect().withPath("/apis/autoscaling/v2beta1/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() {
 
@@ -81,8 +81,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/v1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
-        server.expect().withPath("/apis/autoscaling/v1/namespaces/ns1/horizontalpodautoscalers/hpa2").andReturn(200, hpa2).once();
+        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();
         Exchange ex = template.request("direct:getHPA", new Processor() {
 
             @Override
@@ -100,7 +100,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/v1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
+        server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
 
         Exchange ex = template.request("direct:deleteHPA", new Processor() {