Skip to content

Commit e4a2119

Browse files
committed
Fix inNamespace() errors by using NamespacedKubernetesClient
1 parent e10b9fd commit e4a2119

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/test/java/com/dajudge/kindcontainer/kubectl/KubectlApplyFluentTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.dajudge.kindcontainer.KubernetesContainer;
55
import com.dajudge.kindcontainer.exception.ExecutionException;
66
import io.fabric8.kubernetes.api.model.ConfigMap;
7-
import io.fabric8.kubernetes.client.KubernetesClient;
7+
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
88
import org.junit.jupiter.api.Test;
99

1010
import java.io.IOException;
@@ -89,7 +89,7 @@ public void can_interpolate_with_container_info() {
8989
assertInterpolates(config, k8s -> k8s.getContainerInfo().getId());
9090
}
9191

92-
private boolean serviceAccountExists(final KubernetesClient client) {
92+
private boolean serviceAccountExists(final NamespacedKubernetesClient client) {
9393
return null != client.inNamespace("my-namespace").serviceAccounts()
9494
.withName("my-service-account")
9595
.get();
@@ -113,7 +113,7 @@ private void assertInterpolates(
113113

114114
private void withK8s(
115115
final Function<KubernetesContainer<?>, KubernetesContainer<?>> config,
116-
final BiConsumer<KubernetesContainer<?>, KubernetesClient> consumer
116+
final BiConsumer<KubernetesContainer<?>, NamespacedKubernetesClient> consumer
117117
) {
118118
try (final KubernetesContainer<?> k8s = config.apply(new ApiServerContainer<>())) {
119119
k8s.start();

src/test/java/com/dajudge/kindcontainer/kubectl/KubectlWaitFluentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class KubectlWaitFluentTest {
3636

3737
@BeforeEach
3838
public void before() {
39-
client = new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build().inNamespace(namespace);
39+
client = ((NamespacedKubernetesClient) new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build()).inNamespace(namespace);
4040
client.namespaces().create(new NamespaceBuilder().withNewMetadata().withName(namespace).endMetadata().build());
4141
}
4242

src/test/java/com/dajudge/kindcontainer/util/TestUtils.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.fabric8.kubernetes.api.model.*;
99
import io.fabric8.kubernetes.client.KubernetesClient;
1010
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
11+
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
1112
import org.testcontainers.shaded.com.google.common.io.Resources;
1213

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

117118
public static <T extends KubernetesContainer<T>, O> O runWithClient(
118119
final KubernetesContainer<?> k8s,
119-
final ThrowingConsumer<KubernetesClient, Exception> consumer
120+
final ThrowingConsumer<NamespacedKubernetesClient, Exception> consumer
120121
) {
121122
return runWithClient(k8s, client -> {
122123
consumer.accept(client);
@@ -126,9 +127,9 @@ public static <T extends KubernetesContainer<T>, O> O runWithClient(
126127

127128
public static <O> O runWithClient(
128129
final KubernetesContainer<?> k8s,
129-
final ThrowingFunction<KubernetesClient, O, Exception> consumer
130+
final ThrowingFunction<NamespacedKubernetesClient, O, Exception> consumer
130131
) {
131-
try (final KubernetesClient client = new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build()) {
132+
try (final NamespacedKubernetesClient client = (NamespacedKubernetesClient) new KubernetesClientBuilder().withConfig(fromKubeconfig(k8s.getKubeconfig())).build()) {
132133
try {
133134
return consumer.apply(client);
134135
} catch (final Exception e) {

0 commit comments

Comments
 (0)