diff --git a/src/test/java/com/dajudge/kindcontainer/ConfigurableNodePortRangeTest.java b/src/test/java/com/dajudge/kindcontainer/ConfigurableNodePortRangeTest.java index 6be2db80..f99f876e 100644 --- a/src/test/java/com/dajudge/kindcontainer/ConfigurableNodePortRangeTest.java +++ b/src/test/java/com/dajudge/kindcontainer/ConfigurableNodePortRangeTest.java @@ -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; @@ -39,7 +40,7 @@ public Stream can_expose_in_valid_range() { public Stream 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); } })); @@ -47,7 +48,7 @@ public Stream cannot_expose_outside_of_valid_range() { } private void createService( - final DefaultKubernetesClient client, + final KubernetesClient client, final String name, final int nodePort ) { diff --git a/src/test/java/com/dajudge/kindcontainer/KubeconfigTest.java b/src/test/java/com/dajudge/kindcontainer/KubeconfigTest.java index bf689faf..c6314166 100644 --- a/src/test/java/com/dajudge/kindcontainer/KubeconfigTest.java +++ b/src/test/java/com/dajudge/kindcontainer/KubeconfigTest.java @@ -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; @@ -29,7 +30,7 @@ private void assertWithKubeconfigGetsExecuted(final KubernetesTestPackage 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") diff --git a/src/test/java/com/dajudge/kindcontainer/ReuseTest.java b/src/test/java/com/dajudge/kindcontainer/ReuseTest.java index c265ec6d..4463bdf8 100644 --- a/src/test/java/com/dajudge/kindcontainer/ReuseTest.java +++ b/src/test/java/com/dajudge/kindcontainer/ReuseTest.java @@ -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; @@ -26,13 +27,13 @@ public Stream does_not_reapply_postAvailabilityExecutions() { private void assertDoesNotReapplyPostAvailabilityExecutions(final Supplier> 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()); } diff --git a/src/test/java/com/dajudge/kindcontainer/ServiceAccountTest.java b/src/test/java/com/dajudge/kindcontainer/ServiceAccountTest.java index 94854dcd..e497dd76 100644 --- a/src/test/java/com/dajudge/kindcontainer/ServiceAccountTest.java +++ b/src/test/java/com/dajudge/kindcontainer/ServiceAccountTest.java @@ -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; @@ -24,14 +25,14 @@ private void assertCreatesClientForServiceAccount(final KubernetesTestPackage { // 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(); diff --git a/src/test/java/com/dajudge/kindcontainer/kubectl/KubectlApplyFluentTest.java b/src/test/java/com/dajudge/kindcontainer/kubectl/KubectlApplyFluentTest.java index 80847c15..a99b9313 100644 --- a/src/test/java/com/dajudge/kindcontainer/kubectl/KubectlApplyFluentTest.java +++ b/src/test/java/com/dajudge/kindcontainer/kubectl/KubectlApplyFluentTest.java @@ -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.KubernetesClient; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -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 KubernetesClient client) { return null != client.inNamespace("my-namespace").serviceAccounts() .withName("my-service-account") .get(); @@ -113,7 +113,7 @@ private void assertInterpolates( private void withK8s( final Function, KubernetesContainer> config, - final BiConsumer, DefaultKubernetesClient> consumer + final BiConsumer, KubernetesClient> consumer ) { try (final KubernetesContainer k8s = config.apply(new ApiServerContainer<>())) { k8s.start(); diff --git a/src/test/java/com/dajudge/kindcontainer/kubectl/KubectlWaitFluentTest.java b/src/test/java/com/dajudge/kindcontainer/kubectl/KubectlWaitFluentTest.java index cad6c7a7..bcd3f69c 100644 --- a/src/test/java/com/dajudge/kindcontainer/kubectl/KubectlWaitFluentTest.java +++ b/src/test/java/com/dajudge/kindcontainer/kubectl/KubectlWaitFluentTest.java @@ -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; @@ -36,7 +36,7 @@ public class KubectlWaitFluentTest { @BeforeEach public void before() { - client = new DefaultKubernetesClient(fromKubeconfig(k8s.getKubeconfig())).inNamespace(namespace); + client = new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build().inNamespace(namespace); client.namespaces().create(new NamespaceBuilder().withNewMetadata().withName(namespace).endMetadata().build()); } diff --git a/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeApiServerTest.java b/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeApiServerTest.java index 687615a6..b2a75f12 100644 --- a/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeApiServerTest.java +++ b/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeApiServerTest.java @@ -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; @@ -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()); } } diff --git a/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeK3sTest.java b/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeK3sTest.java index d0549030..140e3248 100644 --- a/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeK3sTest.java +++ b/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeK3sTest.java @@ -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; @@ -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()); } } diff --git a/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeKindTest.java b/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeKindTest.java index f8cfbc8b..a2dd998d 100644 --- a/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeKindTest.java +++ b/src/test/java/com/dajudge/kindcontainer/readme/junit5/SomeKindTest.java @@ -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; @@ -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()); } } diff --git a/src/test/java/com/dajudge/kindcontainer/util/TestUtils.java b/src/test/java/com/dajudge/kindcontainer/util/TestUtils.java index 6fe7f92f..7caa241f 100644 --- a/src/test/java/com/dajudge/kindcontainer/util/TestUtils.java +++ b/src/test/java/com/dajudge/kindcontainer/util/TestUtils.java @@ -6,8 +6,8 @@ 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 org.testcontainers.shaded.com.google.common.io.Resources; import java.io.ByteArrayOutputStream; @@ -116,7 +116,7 @@ public static String readString(final InputStream is) throws IOException { public static , O> O runWithClient( final KubernetesContainer k8s, - final ThrowingConsumer consumer + final ThrowingConsumer consumer ) { return runWithClient(k8s, client -> { consumer.accept(client); @@ -126,9 +126,9 @@ public static , O> O runWithClient( public static O runWithClient( final KubernetesContainer k8s, - final ThrowingFunction consumer + final ThrowingFunction consumer ) { - try (final DefaultKubernetesClient client = new DefaultKubernetesClient(fromKubeconfig(k8s.getKubeconfig()))) { + try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build()) { try { return consumer.apply(client); } catch (final Exception e) { diff --git a/src/test/java/com/dajudge/kindcontainer/webhook/WebhookTest.java b/src/test/java/com/dajudge/kindcontainer/webhook/WebhookTest.java index 6958c08c..a44a4266 100644 --- a/src/test/java/com/dajudge/kindcontainer/webhook/WebhookTest.java +++ b/src/test/java/com/dajudge/kindcontainer/webhook/WebhookTest.java @@ -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; @@ -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)