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 54f6bdf99dc Upgrade kubernetes-client to 6.8.1
54f6bdf99dc is described below
commit 54f6bdf99dc207ca3e259a31af111d1014abc4b5
Author: James Netherton <[email protected]>
AuthorDate: Tue Sep 19 07:18:24 2023 +0100
Upgrade kubernetes-client to 6.8.1
---
.../fabric8/kubernetes/client/ConfigFluentImplConfigurer.java | 6 ------
.../component/kubernetes/cluster/utils/LockTestServer.java | 10 +++++-----
parent/pom.xml | 4 ++--
3 files changed, 7 insertions(+), 13 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 bc4d0308224..8d9a1560aa4 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,8 +57,6 @@ 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":
@@ -170,8 +168,6 @@ 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":
@@ -284,8 +280,6 @@ 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 fba62ef9b2f..4abcf11e788 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.Config;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
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
- protected Config getMockConfiguration() {
+ public NamespacedKubernetesClient createClient() {
// Avoid exponential retry backoff from slowing down tests
- Config mockConfiguration = super.getMockConfiguration();
- RequestConfig requestConfig = mockConfiguration.getRequestConfig();
+ NamespacedKubernetesClient namespacedKubernetesClient =
super.createClient();
+ RequestConfig requestConfig =
namespacedKubernetesClient.getConfiguration().getRequestConfig();
requestConfig.setRequestRetryBackoffInterval(1000);
requestConfig.setRequestRetryBackoffLimit(0);
- return mockConfiguration;
+ return namespacedKubernetesClient;
}
public void addSimulator(ResourceLockSimulator<?> paramLockSimulator) {
diff --git a/parent/pom.xml b/parent/pom.xml
index ac56b80ad0d..0e0aab0f31b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -297,8 +297,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.7.2</kubernetes-client-version>
- <kubernetes-model-version>6.7.2</kubernetes-model-version>
+ <kubernetes-client-version>6.8.1</kubernetes-client-version>
+ <kubernetes-model-version>6.8.1</kubernetes-model-version>
<kudu-version>1.17.0</kudu-version>
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.12</leveldb-api-version>