Skip to content

Commit

Permalink
deps: bump Kubernetes Client from 6.13.1 to 7.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
manusa committed Dec 4, 2024
1 parent 3ee7733 commit c5c1e58
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- main
pull_request:
schedule:
- cron: '0 1 * * *' # Everyday at 1
- cron: '0 1 * * *' # Every day at 1

permissions:
contents: read
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static void printDiagnosis(JKubeCase jKubeCase) throws IOException, InterruptedE
System.err.println(pod.getStatus());
System.err.println("---------------------------");
});
if (jKubeCase.getKubernetesClient().isAdaptable(OpenShiftClient.class)) {
if (jKubeCase.getKubernetesClient().adapt(OpenShiftClient.class).supports(Route.class)) {
final OpenShiftClient oc = jKubeCase.getKubernetesClient().adapt(OpenShiftClient.class);
System.err.println("\n\n===========================");
System.err.println("\nDeployment:");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
*/
package org.eclipse.jkube.integrationtests.windows;

import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import io.fabric8.kubernetes.client.utils.HttpClientUtils;
import org.apache.maven.shared.invoker.InvocationResult;
import org.apache.maven.shared.invoker.MavenInvocationException;
import org.eclipse.jkube.integrationtests.jupiter.api.DockerRegistry;
Expand All @@ -34,6 +32,7 @@
import java.nio.file.Files;
import java.util.Collections;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -97,11 +96,15 @@ void k8sPush() throws Exception {
final InvocationResult invocationResult = maven("k8s:push", properties);
// Then
assertInvocation(invocationResult);
final Response response = new OkHttpClient.Builder().build().newCall(new Request.Builder()
.get().url("http://localhost:5000/v2/integration-tests/windows/tags/list").build())
.execute();
assertThat(response.body().string(),
containsString("{\"name\":\"integration-tests/windows\",\"tags\":[\"latest\"]}"));
final var httpFactory = HttpClientUtils.getHttpClientFactory();
try (final var http = httpFactory.newBuilder().build()) {
final var req = http.newHttpRequestBuilder().uri("http://localhost:5000/v2/integration-tests/windows/tags/list")
.build();
final var res = http.sendAsync(req, String.class).get(10, TimeUnit.SECONDS);
assertThat(res.isSuccessful(), equalTo(true));
assertThat(res.bodyString(),
containsString("{\"name\":\"integration-tests/windows\",\"tags\":[\"latest\"]}"));
}
}

@Test
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@
<apache.maven-failsafe-plugin.version>3.1.2</apache.maven-failsafe-plugin.version>
<apache.maven.maven-invoker.version>3.2.0</apache.maven.maven-invoker.version>
<apache.commons-codec.version>1.16.0</apache.commons-codec.version>
<apache-felix.maven-bundle-plugin.version>5.1.9</apache-felix.maven-bundle-plugin.version>
<camel.version>2.25.4</camel.version>
<com.fasterxml.jackson.core.version>2.15.2</com.fasterxml.jackson.core.version>
<com.fasterxml.jackson.dataformat.yaml.version>2.15.2</com.fasterxml.jackson.dataformat.yaml.version>
<fabric8.kubernetes-client.version>6.13.1</fabric8.kubernetes-client.version>
<fabric8.kubernetes-client.version>7.0.0</fabric8.kubernetes-client.version>
<guava.version>32.1.2-jre</guava.version> <!-- Required by Gradle Test Toolkit (testkit) -->
<gradle.version>8.7</gradle.version>
<gradle-api-maven-plugin-version>0.0.3</gradle-api-maven-plugin-version>
Expand Down
1 change: 1 addition & 0 deletions projects-to-be-tested/maven/karaf/camel-log/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${apache-felix.maven-bundle-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down

0 comments on commit c5c1e58

Please sign in to comment.