Skip to content

Migrate to Fabric8 Kubernetes Client builder API #429

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

Draft
dajudge wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Migrate to Fabric8 Kubernetes Client builder API #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e10b9fd
Migrate from deprecated DefaultKubernetesClient to KubernetesClientBu…
dajudge Dec 12, 2025
e4a2119
Fix inNamespace() errors by using NamespacedKubernetesClient
claude Dec 24, 2025
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
7 changes: 4 additions & 3 deletions src/test/java/com/dajudge/kindcontainer/ConfigurableNodePortRangeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServicePortBuilder;
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.fabric8.kubernetes.client.KubernetesClientException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
Expand Down Expand Up @@ -39,15 +40,15 @@ public Stream<DynamicTest> can_expose_in_valid_range() {
public Stream<DynamicTest> cannot_expose_outside_of_valid_range() {
return kubeletContainers(testPkg -> {
runWithK8s(configureContainer(testPkg.newContainer()), k8s -> assertThrows(KubernetesClientException.class, () -> {
try (final DefaultKubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(k8s.getKubeconfig()))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build()) {
createService(client, "invalid-port-service", 20011);
}
}));
});
}

private void createService(
final DefaultKubernetesClient client,
final KubernetesClient client,
final String name,
final int nodePort
) {
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/dajudge/kindcontainer/KubeconfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import com.dajudge.kindcontainer.util.ContainerVersionHelpers.KubernetesTestPackage;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;

Expand All @@ -29,7 +30,7 @@ private void assertWithKubeconfigGetsExecuted(final KubernetesTestPackage<? exte

private static KubernetesContainer<?> configureContainer(final KubernetesContainer<?> container) {
return container.withKubeconfig(kubeconfig -> {
try (final DefaultKubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(kubeconfig))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(kubeconfig)).build()) {
client.inNamespace("default").configMaps().create(new ConfigMapBuilder()
.withNewMetadata()
.withName("test")
Expand Down
7 changes: 4 additions & 3 deletions src/test/java/com/dajudge/kindcontainer/ReuseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.dajudge.kindcontainer;

import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;

Expand All @@ -26,13 +27,13 @@ public Stream<DynamicTest> does_not_reapply_postAvailabilityExecutions() {
private void assertDoesNotReapplyPostAvailabilityExecutions(final Supplier<KubernetesContainer<?>> factory) {
try (final KubernetesContainer<?> orig = applyConfig(factory.get())) {
orig.start();
try (final DefaultKubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(orig.getKubeconfig()))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(orig.getKubeconfig())).build()) {
assertNotNull(client.serviceAccounts().inNamespace("my-namespace").withName("my-service-account").get());
client.serviceAccounts().inNamespace("my-namespace").withName("my-service-account").delete();
}
final KubernetesContainer<?> copy = applyConfig(factory.get());
copy.start();
try (final DefaultKubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(copy.getKubeconfig()))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(copy.getKubeconfig())).build()) {
assertNotNull(client.namespaces().withName("my-namespace").get());
assertNull(client.serviceAccounts().inNamespace("my-namespace").withName("my-service-account").get());
}
Expand Down
7 changes: 4 additions & 3 deletions src/test/java/com/dajudge/kindcontainer/ServiceAccountTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import com.dajudge.kindcontainer.util.ContainerVersionHelpers.KubernetesTestPackage;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.fabric8.kubernetes.client.KubernetesClientException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
Expand All @@ -24,14 +25,14 @@ private void assertCreatesClientForServiceAccount(final KubernetesTestPackage<?
runWithK8s(configureContainer(testPkg.newContainer()), k8s -> {
// First do a sanity check w/ admin privileges
final String kubeconfig1 = k8s.getKubeconfig();
try (final DefaultKubernetesClient client = new DefaultKubernetesClient(Config.fromKubeconfig(kubeconfig1))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(Config.fromKubeconfig(kubeconfig1)).build()) {
client.pods().inNamespace("my-namespace").list();
client.inNamespace("my-namespace").secrets().list();
}

// Now try again with limited privileges
final String kubeconfig2 = k8s.getServiceAccountKubeconfig("my-namespace", "my-service-account");
try (final DefaultKubernetesClient client = new DefaultKubernetesClient(Config.fromKubeconfig(kubeconfig2))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(Config.fromKubeconfig(kubeconfig2)).build()) {
client.pods().inNamespace("my-namespace").list();
try {
client.inNamespace("my-namespace").secrets().list();
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/dajudge/kindcontainer/kubectl/KubectlApplyFluentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.dajudge.kindcontainer.KubernetesContainer;
import com.dajudge.kindcontainer.exception.ExecutionException;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import org.junit.jupiter.api.Test;

import java.io.IOException;
Expand Down Expand Up @@ -89,7 +89,7 @@ public void can_interpolate_with_container_info() {
assertInterpolates(config, k8s -> k8s.getContainerInfo().getId());
}

private boolean serviceAccountExists(final DefaultKubernetesClient client) {
private boolean serviceAccountExists(final NamespacedKubernetesClient client) {
return null != client.inNamespace("my-namespace").serviceAccounts()
.withName("my-service-account")
.get();
Expand All @@ -113,7 +113,7 @@ private void assertInterpolates(

private void withK8s(
final Function<KubernetesContainer<?>, KubernetesContainer<?>> config,
final BiConsumer<KubernetesContainer<?>, DefaultKubernetesClient> consumer
final BiConsumer<KubernetesContainer<?>, NamespacedKubernetesClient> consumer
) {
try (final KubernetesContainer<?> k8s = config.apply(new ApiServerContainer<>())) {
k8s.start();
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/dajudge/kindcontainer/kubectl/KubectlWaitFluentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
import io.fabric8.kubernetes.api.model.apps.DeploymentConditionBuilder;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
Expand Down Expand Up @@ -36,7 +36,7 @@ public class KubectlWaitFluentTest {

@BeforeEach
public void before() {
client = new DefaultKubernetesClient(fromKubeconfig(k8s.getKubeconfig())).inNamespace(namespace);
client = ((NamespacedKubernetesClient) new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build()).inNamespace(namespace);
client.namespaces().create(new NamespaceBuilder().withNewMetadata().withName(namespace).endMetadata().build());
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeApiServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.dajudge.kindcontainer.readme.junit5;

import com.dajudge.kindcontainer.ApiServerContainer;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.junit.jupiter.api.Test;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
Expand All @@ -18,7 +18,7 @@ public class SomeApiServerTest {
@Test
public void verify_no_node_is_present() {
// Create a fabric8 client and use it!
try (final KubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(KUBE.getKubeconfig()))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(KUBE.getKubeconfig())).build()) {
assertTrue(client.nodes().list().getItems().isEmpty());
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeK3sTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.dajudge.kindcontainer.readme.junit5;

import com.dajudge.kindcontainer.K3sContainer;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.junit.jupiter.api.Test;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
Expand All @@ -18,7 +18,7 @@ public class SomeK3sTest {
@Test
public void verify_node_is_present() {
// Create a fabric8 client and use it!
try (final KubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(K3S.getKubeconfig()))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(K3S.getKubeconfig())).build()) {
assertEquals(1, client.nodes().list().getItems().size());
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeKindTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.dajudge.kindcontainer.readme.junit5;

import com.dajudge.kindcontainer.KindContainer;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.junit.jupiter.api.Test;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
Expand All @@ -18,7 +18,7 @@ public class SomeKindTest {
@Test
public void verify_node_is_present() {
// Create a fabric8 client and use it!
try (final KubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(KUBE.getKubeconfig()))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(KUBE.getKubeconfig())).build()) {
assertEquals(1, client.nodes().list().getItems().size());
}
}
Expand Down
9 changes: 5 additions & 4 deletions src/test/java/com/dajudge/kindcontainer/util/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
import com.dajudge.kindcontainer.client.http.Response;
import com.dajudge.kindcontainer.client.http.TinyHttpClient;
import io.fabric8.kubernetes.api.model.*;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import org.testcontainers.shaded.com.google.common.io.Resources;

import java.io.ByteArrayOutputStream;
Expand Down Expand Up @@ -116,7 +117,7 @@ public static String readString(final InputStream is) throws IOException {

public static <T extends KubernetesContainer<T>, O> O runWithClient(
final KubernetesContainer<?> k8s,
final ThrowingConsumer<DefaultKubernetesClient, Exception> consumer
final ThrowingConsumer<NamespacedKubernetesClient, Exception> consumer
) {
return runWithClient(k8s, client -> {
consumer.accept(client);
Expand All @@ -126,9 +127,9 @@ public static <T extends KubernetesContainer<T>, O> O runWithClient(

public static <O> O runWithClient(
final KubernetesContainer<?> k8s,
final ThrowingFunction<DefaultKubernetesClient, O, Exception> consumer
final ThrowingFunction<NamespacedKubernetesClient, O, Exception> consumer
) {
try (final DefaultKubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(k8s.getKubeconfig()))) {
try (final NamespacedKubernetesClient client = (NamespacedKubernetesClient) new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build()) {
try {
return consumer.apply(client);
} catch (final Exception e) {
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/dajudge/kindcontainer/webhook/WebhookTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.api.model.Namespace;
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import org.junit.jupiter.api.DynamicTest;
Expand Down Expand Up @@ -102,7 +103,7 @@ private static void runWithWebhooks(
) {
final String namespaceName = UUID.randomUUID().toString();
k8s.start();
try (final DefaultKubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(k8s.getKubeconfig()))) {
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build()) {
final Namespace ns = new NamespaceBuilder()
.withNewMetadata()
.withName(namespaceName)
Expand Down
Loading