You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/07/31 09:21:26 UTC
[camel] branch main updated: Revert "Upgrade Kubernetes Client to version 6.8.0 (#10852)"
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 24507921e0e Revert "Upgrade Kubernetes Client to version 6.8.0 (#10852)"
24507921e0e is described below
commit 24507921e0e0d59434b520a18a753b4d8bf958ea
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jul 31 09:48:52 2023 +0100
Revert "Upgrade Kubernetes Client to version 6.8.0 (#10852)"
This reverts commit 65bb252d849d0d5e0c5d5434cd00ede403ec9dd2.
---
.../fabric8/kubernetes/client/ConfigFluentImplConfigurer.java | 6 ++++++
.../component/kubernetes/cluster/utils/LockTestServer.java | 10 +++++-----
parent/pom.xml | 4 ++--
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/components/camel-kubernetes/src/generated/java/io/fabric8/kubernetes/client/ConfigFluentImplConfigurer.java b/components/camel-kubernetes/src/generated/java/io/fabric8/kubernetes/client/ConfigFluentImplConfigurer.java
index 8d9a1560aa4..bc4d0308224 100644
--- a/components/camel-kubernetes/src/generated/java/io/fabric8/kubernetes/client/ConfigFluentImplConfigurer.java
+++ b/components/camel-kubernetes/src/generated/java/io/fabric8/kubernetes/client/ConfigFluentImplConfigurer.java
@@ -57,6 +57,8 @@ public class ConfigFluentImplConfigurer extends org.apache.camel.support.compone
case "DefaultNamespace": target.withDefaultNamespace(property(camelContext, boolean.class, value)); return true;
case "disablehostnameverification":
case "DisableHostnameVerification": target.withDisableHostnameVerification(property(camelContext, boolean.class, value)); return true;
+ case "errormessages":
+ case "ErrorMessages": target.withErrorMessages(property(camelContext, java.util.Map.class, value)); return true;
case "file":
case "File": target.withFile(property(camelContext, java.io.File.class, value)); return true;
case "http2disable":
@@ -168,6 +170,8 @@ public class ConfigFluentImplConfigurer extends org.apache.camel.support.compone
case "DefaultNamespace": return boolean.class;
case "disablehostnameverification":
case "DisableHostnameVerification": return boolean.class;
+ case "errormessages":
+ case "ErrorMessages": return java.util.Map.class;
case "file":
case "File": return java.io.File.class;
case "http2disable":
@@ -280,6 +284,8 @@ public class ConfigFluentImplConfigurer extends org.apache.camel.support.compone
case "DefaultNamespace": return target.isDefaultNamespace();
case "disablehostnameverification":
case "DisableHostnameVerification": return target.isDisableHostnameVerification();
+ case "errormessages":
+ case "ErrorMessages": return target.getErrorMessages();
case "file":
case "File": return target.getFile();
case "http2disable":
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
index 4abcf11e788..fba62ef9b2f 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.api.model.PodListBuilder;
-import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.RequestConfig;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.utils.ResponseProvider;
@@ -77,13 +77,13 @@ public class LockTestServer<T extends HasMetadata> extends KubernetesMockServer
}
@Override
- public NamespacedKubernetesClient createClient() {
+ protected Config getMockConfiguration() {
// Avoid exponential retry backoff from slowing down tests
- NamespacedKubernetesClient namespacedKubernetesClient = super.createClient();
- RequestConfig requestConfig = namespacedKubernetesClient.getConfiguration().getRequestConfig();
+ Config mockConfiguration = super.getMockConfiguration();
+ RequestConfig requestConfig = mockConfiguration.getRequestConfig();
requestConfig.setRequestRetryBackoffInterval(1000);
requestConfig.setRequestRetryBackoffLimit(0);
- return namespacedKubernetesClient;
+ return mockConfiguration;
}
public void addSimulator(ResourceLockSimulator<?> paramLockSimulator) {
diff --git a/parent/pom.xml b/parent/pom.xml
index de30017713d..d35ad47764b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -298,8 +298,8 @@
<jzlib-version>1.1.3</jzlib-version>
<kafka-version>3.5.1</kafka-version>
<kotlin-version>1.9.0</kotlin-version>
- <kubernetes-client-version>6.8.0</kubernetes-client-version>
- <kubernetes-model-version>6.8.0</kubernetes-model-version>
+ <kubernetes-client-version>6.7.2</kubernetes-client-version>
+ <kubernetes-model-version>6.7.2</kubernetes-model-version>
<kudu-version>1.16.0</kudu-version>
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.12</leveldb-api-version>