Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CAMEL-21509: Upgrade kubernetes-client to 7.0.1 #16750

Merged
merged 1 commit into from
Jan 8, 2025
Merged

CAMEL-21509: Upgrade kubernetes-client to 7.0.1 #16750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 1 addition & 31 deletions components/camel-kubernetes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,6 @@
<properties>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>mockwebserver</artifactId>
<version>${mockwebserver-version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
Expand Down Expand Up @@ -85,16 +68,10 @@
<version>${kubernetes-client-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>openshift-server-mock</artifactId>
<version>${kubernetes-client-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>mockwebserver</artifactId>
<version>${mockwebserver-version}</version>
<version>${kubernetes-client-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -128,13 +105,6 @@
<version>${awaitility-version}</version>
<scope>test</scope>
</dependency>
<!-- forcing okhttp v3.x related to https://issues.apache.org/jira/browse/CAMEL-16336 -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${squareup-okhttp-version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
3 changes: 0 additions & 3 deletions ...ubernetes/src/generated/java/io/fabric8/kubernetes/client/ConfigFluentImplConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj
case "customHeaders": target.withCustomHeaders(property(camelContext, java.util.Map.class, value)); return true;
case "disablehostnameverification":
case "disableHostnameVerification": target.withDisableHostnameVerification(property(camelContext, java.lang.Boolean.class, value)); return true;
case "file": target.withFile(property(camelContext, java.io.File.class, value)); return true;
case "http2disable":
case "http2Disable": target.withHttp2Disable(property(camelContext, java.lang.Boolean.class, value)); return true;
case "httpproxy":
Expand Down Expand Up @@ -162,7 +161,6 @@ public Class<?> getOptionType(String name, boolean ignoreCase) {
case "customHeaders": return java.util.Map.class;
case "disablehostnameverification":
case "disableHostnameVerification": return java.lang.Boolean.class;
case "file": return java.io.File.class;
case "http2disable":
case "http2Disable": return java.lang.Boolean.class;
case "httpproxy":
Expand Down Expand Up @@ -269,7 +267,6 @@ public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
case "customHeaders": return target.getCustomHeaders();
case "disablehostnameverification":
case "disableHostnameVerification": return target.getDisableHostnameVerification();
case "file": return target.getFile();
case "http2disable":
case "http2Disable": return target.getHttp2Disable();
case "httpproxy":
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ protected void doScaleDeployment(Exchange exchange) {
throw new IllegalArgumentException("Scale a specific deployment require specify a replicas number");
}
Deployment deploymentScaled = getEndpoint().getKubernetesClient().apps().deployments().inNamespace(namespaceName)
.withName(deploymentName).scale(replicasNumber, false);
.withName(deploymentName).scale(replicasNumber);

prepareOutboundMessage(exchange, deploymentScaled.getStatus().getReplicas());
}
Expand Down
2 changes: 1 addition & 1 deletion ...omponent/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ protected void doScaleReplicationController(Exchange exchange) {
throw new IllegalArgumentException("Scale a specific replication controller require specify a replicas number");
}
ReplicationController rcScaled = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName)
.withName(rcName).scale(replicasNumber, false);
.withName(rcName).scale(replicasNumber);

prepareOutboundMessage(exchange, rcScaled.getStatus().getReplicas());
}
Expand Down
2 changes: 1 addition & 1 deletion ...pache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ protected void doScaleDeploymentConfig(Exchange exchange) {
DeploymentConfig deploymentConfigScaled
= getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).deploymentConfigs()
.inNamespace(namespaceName)
.withName(deploymentName).scale(replicasNumber, false);
.withName(deploymentName).scale(replicasNumber);

prepareOutboundMessage(exchange, deploymentConfigScaled.getStatus().getReplicas());
}
Expand Down
11 changes: 6 additions & 5 deletions ...tes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import io.fabric8.kubernetes.client.RequestConfig;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.http.Headers;
import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.mockwebserver.utils.ResponseProvider;
import okhttp3.Headers;
import okhttp3.mockwebserver.RecordedRequest;
import org.apache.camel.RuntimeCamelException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -132,7 +132,7 @@ public int getStatusCode(RecordedRequest request) {

boolean done = lockSimulator.setResource(resource, true);
if (done) {
lockNames.put(request.getSequenceNumber(), lockSimulator.getResourceName());
lockNames.put(LockTestServer.super.getRequestCount(), lockSimulator.getResourceName());
return 201;
}
return 500;
Expand All @@ -142,8 +142,9 @@ public int getStatusCode(RecordedRequest request) {
public Object getBody(RecordedRequest recordedRequest) {
delayIfNecessary();

if (lockNames.containsKey(recordedRequest.getSequenceNumber())) {
T resource = simulators.get(lockNames.get(recordedRequest.getSequenceNumber())).getResource();
if (lockNames.containsKey(LockTestServer.super.getRequestCount())) {
T resource
= simulators.get(lockNames.get(LockTestServer.super.getRequestCount())).getResource();
if (resource != null) {
return resource;
}
Expand Down
6 changes: 6 additions & 0 deletions ...rg/apache/camel/component/kubernetes/consumer/integration/KubernetesEventsConsumerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
Expand All @@ -57,6 +58,11 @@ public class KubernetesEventsConsumerIT extends KubernetesTestSupport {
@EndpointInject("mock:result")
protected MockEndpoint mockResultEndpoint;

@BeforeEach
void beforeEach() {
MockEndpoint.resetMocks(context);
}

private void setupFullEventWithHeaders(Exchange exchange) {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_NAME, "test");
Expand Down
14 changes: 1 addition & 13 deletions dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,6 @@
<artifactId>camel-jbang-core</artifactId>
</dependency>

<!-- Needed for TLS access to private registries -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>${bouncycastle-version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle-version}</version>
</dependency>

<!-- Kubernetes -->
<dependency>
<groupId>io.fabric8</groupId>
Expand All @@ -77,7 +65,7 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>knative-model</artifactId>
<version>${knative-client-version}</version>
<version>${kubernetes-client-version}</version>
</dependency>

<!-- Test dependencies -->
Expand Down
8 changes: 4 additions & 4 deletions ...java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/knative/KnativeTrait.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
import java.util.stream.Collectors;

import com.fasterxml.jackson.core.JsonProcessingException;
import io.fabric8.knative.duck.v1.DestinationBuilder;
import io.fabric8.knative.duck.v1.KReference;
import io.fabric8.knative.duck.v1.KReferenceBuilder;
import io.fabric8.knative.eventing.v1.TriggerBuilder;
import io.fabric8.knative.eventing.v1.TriggerFilterBuilder;
import io.fabric8.knative.internal.pkg.apis.duck.v1.DestinationBuilder;
import io.fabric8.knative.internal.pkg.apis.duck.v1.KReference;
import io.fabric8.knative.internal.pkg.apis.duck.v1.KReferenceBuilder;
import io.fabric8.knative.internal.pkg.tracker.ReferenceBuilder;
import io.fabric8.knative.messaging.v1.SubscriptionBuilder;
import io.fabric8.knative.pkg.tracker.ReferenceBuilder;
import io.fabric8.knative.sources.v1.SinkBindingBuilder;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.dsl.jbang.core.commands.kubernetes.KubernetesHelper;
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.Context;
import okhttp3.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.MockWebServer;
import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
import org.apache.camel.dsl.jbang.core.common.PluginHelper;
import org.apache.camel.dsl.jbang.core.common.PluginType;
Expand Down
4 changes: 1 addition & 3 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,7 @@
<jython-version>2.7.4</jython-version>
<jzlib-version>1.1.3</jzlib-version>
<kafka-version>3.8.1</kafka-version>
<knative-client-version>6.13.4</knative-client-version>
<kubernetes-client-version>6.13.4</kubernetes-client-version>
<kubernetes-client-version>7.0.1</kubernetes-client-version>
<kudu-version>1.17.1</kudu-version>
<langchain4j-version>0.36.2</langchain4j-version>
<leveldbjni-version>1.8</leveldbjni-version>
Expand Down Expand Up @@ -368,7 +367,6 @@
<minimal-json-version>0.9.5</minimal-json-version>
<minio-version>8.5.15</minio-version>
<mock-javamail-version>1.9</mock-javamail-version>
<mockwebserver-version>6.13.4</mockwebserver-version>
<mockito-version>5.15.2</mockito-version>
<mojo-executor-version>2.4.0</mojo-executor-version>
<mongo-java-driver-version>5.2.1</mongo-java-driver-version>
Expand Down
Loading